Hive tests with Byzantine

80 files changed, 16591 insertions, 4771 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json
index 5780e13d2..e5cc5a27f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "call_OOG_additionalGasCosts1_d0g0v0_EIP150" : {
+    "call_OOG_additionalGasCosts1_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/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x7530",
-                    "hash" : "0xacfdc530d7222cfb4ff15051c15ccee4cb3cea417571b084ce409dd3c57f3a1f",
-                    "mixHash" : "0xa5b946252ff00a39f9eb16fa55533fa251d7a4421f40552423bf3141be071155",
-                    "nonce" : "0xf507088c02b2db4e",
+                    "gasUsed" : "0x54df",
+                    "hash" : "0x9fbe40a5ebba5f5dcfc0cba0319bea6b993e63eb2abd1f7782759cf699769611",
+                    "mixHash" : "0xfca79e080e50a841e214577f930ba03dbe4b516c48b03f5d3d3930d6a348bb69",
+                    "nonce" : "0xf2784a56ab66fce1",
                     "number" : "0x01",
                     "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
-                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
+                    "receiptTrie" : "0x1f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25",
+                    "stateRoot" : "0xe212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0a5b946252ff00a39f9eb16fa55533fa251d7a4421f40552423bf3141be07115588f507088c02b2db4ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a01f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a0fca79e080e50a841e214577f930ba03dbe4b516c48b03f5d3d3930d6a348bb6988f2784a56ab66fce1f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xacfdc530d7222cfb4ff15051c15ccee4cb3cea417571b084ce409dd3c57f3a1f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9fbe40a5ebba5f5dcfc0cba0319bea6b993e63eb2abd1f7782759cf699769611",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47530",
+                "balance" : "0x4563918244f454df",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7638ad0",
+                "balance" : "0x0de0b6b3a763ab21",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts1_d0g0v0_EIP158" : {
+    "call_OOG_additionalGasCosts1_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/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x54df",
-                    "hash" : "0xe84900a472ce90e57c0c63e5ad055f0007d3c336a851cfe00b5d5beb455e09f1",
-                    "mixHash" : "0x9d6343b74dcab68543cd86701ebaaaf4dd48571c98e413b346687fb9b4cc788b",
-                    "nonce" : "0xa5935c6f8647e49d",
+                    "hash" : "0x092e124ab82df687dd661395526ddaf827d37bf2fd69bfcef1bb92a16509b1ad",
+                    "mixHash" : "0x71b623cfc7c0d649cb02d57b73532b9bb864b280956235a790191a87f1c235c8",
+                    "nonce" : "0x6dba26f7adec3c18",
                     "number" : "0x01",
                     "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "0xabcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50",
-                    "stateRoot" : "0x26df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8",
+                    "receiptTrie" : "0x1f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25",
+                    "stateRoot" : "0xe212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0abcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a09d6343b74dcab68543cd86701ebaaaf4dd48571c98e413b346687fb9b4cc788b88a5935c6f8647e49df861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a01f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a071b623cfc7c0d649cb02d57b73532b9bb864b280956235a790191a87f1c235c8886dba26f7adec3c18f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe84900a472ce90e57c0c63e5ad055f0007d3c336a851cfe00b5d5beb455e09f1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x092e124ab82df687dd661395526ddaf827d37bf2fd69bfcef1bb92a16509b1ad",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts1_d0g0v0_Frontier" : {
+    "call_OOG_additionalGasCosts1_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/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xf3bab2faa565b4d6fbcb0209757600d0782298b14f3e2047d2a878b87be3ca9f",
-                    "mixHash" : "0x712dd15495f4b8be9b09c1e22c00ab87fe49572938d7f9de2ed2cb36cb11b6d5",
-                    "nonce" : "0xde09f093712fef06",
+                    "hash" : "0xf2d779ea18ec5041a990348bb0afbbdd18789e221d036d2c7f3ac6bb7f18033d",
+                    "mixHash" : "0x9ddadc8498dd99c54386db30bee91f8a8157a3af8fbb2d7c93eefec25a50c32b",
+                    "nonce" : "0xced931b369852403",
                     "number" : "0x01",
                     "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
                     "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0712dd15495f4b8be9b09c1e22c00ab87fe49572938d7f9de2ed2cb36cb11b6d588de09f093712fef06f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a09ddadc8498dd99c54386db30bee91f8a8157a3af8fbb2d7c93eefec25a50c32b88ced931b369852403f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3bab2faa565b4d6fbcb0209757600d0782298b14f3e2047d2a878b87be3ca9f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf2d779ea18ec5041a990348bb0afbbdd18789e221d036d2c7f3ac6bb7f18033d",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts1_d0g0v0_Homestead" : {
+    "call_OOG_additionalGasCosts1_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/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -328,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x7530",
-                    "hash" : "0x5f4ba9ffd355e6891cd1568d4d0fd02dc5c0d7d2ada3b0d758592d122b599252",
-                    "mixHash" : "0x72cc569078a9583dd5f832998e2f9d185f5f98aef579fe8bc40d3533c130be5b",
-                    "nonce" : "0x244f116309b31991",
+                    "gasUsed" : "0x54df",
+                    "hash" : "0x578e4c9819ad83b221f3339a85258d65ee28d948ff589b0670b6539a3b25e61c",
+                    "mixHash" : "0xf8f796aeca27cca8c0a41f3466ae6aaa9014014198831611ded5a10f619a10f0",
+                    "nonce" : "0xe6ce56c77dc880c2",
                     "number" : "0x01",
                     "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
-                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
+                    "receiptTrie" : "0xabcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50",
+                    "stateRoot" : "0x26df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a072cc569078a9583dd5f832998e2f9d185f5f98aef579fe8bc40d3533c130be5b88244f116309b31991f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026df46aa15a8d44f0ca7c8d726b816677b60caa8709620b22674aed532e10ce8a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0abcaec009f7724bf2b67d023e33e50735945e12608689f75d7732eda2e32fe50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a0f8f796aeca27cca8c0a41f3466ae6aaa9014014198831611ded5a10f619a10f088e6ce56c77dc880c2f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f4ba9ffd355e6891cd1568d4d0fd02dc5c0d7d2ada3b0d758592d122b599252",
-        "network" : "Homestead",
+        "lastblockhash" : "0x578e4c9819ad83b221f3339a85258d65ee28d948ff589b0670b6539a3b25e61c",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -388,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47530",
+                "balance" : "0x4563918244f454df",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7638ad0",
+                "balance" : "0x0de0b6b3a763ab21",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +433,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts1_d0g0v0_Metropolis" : {
+    "call_OOG_additionalGasCosts1_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/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x54df",
-                    "hash" : "0x107fd0631562959f2f4e5bed1f1e81e6bd5949bab8dc61d12de02d9e12cb3262",
-                    "mixHash" : "0x874c556bf375a06fb97f538e3904157276a15443f42754d9a13d6cd91c77c1aa",
-                    "nonce" : "0xc472a4fff40cac08",
+                    "gasUsed" : "0x7530",
+                    "hash" : "0xc99d152b7c8a372357b8355bd678e030c7d26bee50ade337652593ab16a3f18a",
+                    "mixHash" : "0x1532dcdf7d26c1fc0aec01695e46d7116b49009414be8080866e892468c7a712",
+                    "nonce" : "0x58c6497b57d68655",
                     "number" : "0x01",
                     "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
-                    "receiptTrie" : "0x1f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25",
-                    "stateRoot" : "0xe212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6",
+                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
+                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e212be0e550e41f8f0ca08312547409d5b8b3530ec3d9b91fbfb442cf2df01d6a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a01f31c35fb78fd0f3cc866e3c0901931fd9fcc6dee874682656f1a3cf39f92c25b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008254df8203e880a0874c556bf375a06fb97f538e3904157276a15443f42754d9a13d6cd91c77c1aa88c472a4fff40cac08f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a01532dcdf7d26c1fc0aec01695e46d7116b49009414be8080866e892468c7a7128858c6497b57d68655f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x107fd0631562959f2f4e5bed1f1e81e6bd5949bab8dc61d12de02d9e12cb3262",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc99d152b7c8a372357b8355bd678e030c7d26bee50ade337652593ab16a3f18a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47530",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7638ad0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "call_OOG_additionalGasCosts1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x7530",
+                    "hash" : "0x64098f6c57ab315869f4806ed7b982ea72af5cf8fbfc04bb0d2509a202c6e0f0",
+                    "mixHash" : "0x65bd6535335a5f7606fb78ddfdcdc9f3dd33afec54af2a744e4ad06fa18bbeea",
+                    "nonce" : "0x3ec4027b4375a569",
+                    "number" : "0x01",
+                    "parentHash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+                    "receiptTrie" : "0x5cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9",
+                    "stateRoot" : "0x74794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f8a08e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074794d7f29dad630519374b4dcd5a7689508ae6a9f72536dc409cb2218fc99c9a02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a05cf984ba0a3854222af906c62d9ffc1f41d33f0a7ba9f8feda92f30d68a13ea9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a065bd6535335a5f7606fb78ddfdcdc9f3dd33afec54af2a744e4ad06fa18bbeea883ec4027b4375a569f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7530",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
+                        "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0x8e7c561fada6c99544bc232162ca9a2ee7aba7a6ae67cb924f62979409786a15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eecf2d4085548a36784013b5c7212977f3462813adecfe55353ca2a5f9f87597a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x64098f6c57ab315869f4806ed7b982ea72af5cf8fbfc04bb0d2509a202c6e0f0",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
@@ -500,14 +612,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f454df",
+                "balance" : "0x4563918244f47530",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763ab21",
+                "balance" : "0x0de0b6b3a7638ad0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
index 34739f36b..348d39359 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "call_OOG_additionalGasCosts2_d0g0v0_EIP150" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x92e5828bbb8c06038b5dcbd73a849e23517e1665ccb96fa176981bd1d449f0c1",
-                    "mixHash" : "0xe40821f15e6e960a4047d43d376c6b5644b7bb3406af350128287288dfaf4465",
-                    "nonce" : "0xb90ea8fabeaf796a",
+                    "hash" : "0x992c10cc1dec62ac99b17a0b6f3da8ce204ad9c154ff8c1c911ebc390d77da1f",
+                    "mixHash" : "0x071b52b8f27592331d8aff4431b71ae2f19a667e35243ecae25974b9c26a0573",
+                    "nonce" : "0x6e971fb0d0aa42dc",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0e40821f15e6e960a4047d43d376c6b5644b7bb3406af350128287288dfaf446588b90ea8fabeaf796af861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0071b52b8f27592331d8aff4431b71ae2f19a667e35243ecae25974b9c26a0573886e971fb0d0aa42dcf861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92e5828bbb8c06038b5dcbd73a849e23517e1665ccb96fa176981bd1d449f0c1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x992c10cc1dec62ac99b17a0b6f3da8ce204ad9c154ff8c1c911ebc390d77da1f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_EIP158" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x29afa1b6b06b5c8825223010072ad8913c41d7435c415673c7f22a71cb985990",
-                    "mixHash" : "0x4aebcb8c56c9d986e29bc71601990178dbb901da899451bc433c4734aaa048bc",
-                    "nonce" : "0xedab729c7b7ee061",
+                    "hash" : "0x00ac6b2db2235b48aa2652146f95ecb6322fb8005329d4cf98e8cd98ed19549b",
+                    "mixHash" : "0x3411b263bd0b0c97144b0e40452af6fb1dedf4e180bfbd735c404f62e3c055de",
+                    "nonce" : "0xdb601f1f5b10cf4e",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a04aebcb8c56c9d986e29bc71601990178dbb901da899451bc433c4734aaa048bc88edab729c7b7ee061f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a03411b263bd0b0c97144b0e40452af6fb1dedf4e180bfbd735c404f62e3c055de88db601f1f5b10cf4ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29afa1b6b06b5c8825223010072ad8913c41d7435c415673c7f22a71cb985990",
-        "network" : "EIP158",
+        "lastblockhash" : "0x00ac6b2db2235b48aa2652146f95ecb6322fb8005329d4cf98e8cd98ed19549b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_Frontier" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x73f432da5724f1f8ae0952d2ccbff33ae8da91c4d87cd40dd0229e2339009992",
-                    "mixHash" : "0x6f16c1a4949226c04088c9d846200fc3cd41c90dcd19289d46c779ece5ade916",
-                    "nonce" : "0x35a8cdb995caf979",
+                    "hash" : "0x179b6bee401349b0828cd0efbb6b4195464b9b71e7184e1c51459849194066c1",
+                    "mixHash" : "0x161bfd63a6629e6b21ea4f2061804f5bbe96e0e900add07305cdf7c23657da85",
+                    "nonce" : "0xcd93dd0e05e60bae",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
                     "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a06f16c1a4949226c04088c9d846200fc3cd41c90dcd19289d46c779ece5ade9168835a8cdb995caf979f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0161bfd63a6629e6b21ea4f2061804f5bbe96e0e900add07305cdf7c23657da8588cd93dd0e05e60baef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73f432da5724f1f8ae0952d2ccbff33ae8da91c4d87cd40dd0229e2339009992",
-        "network" : "Frontier",
+        "lastblockhash" : "0x179b6bee401349b0828cd0efbb6b4195464b9b71e7184e1c51459849194066c1",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_Homestead" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xed149c5175ec3d855b07156dc8587216a5b7a25580abdb14a114794b3b3afb5d",
-                    "mixHash" : "0x1405c27216e0294ad1e6731b13406a88178c532a4d14d08006edd48ef9ddad90",
-                    "nonce" : "0x3bae88891d7b7762",
+                    "hash" : "0x64c521245ea31e39dfd6e927228fe0ef5ad1eaf2dc49c196d11a816c8ba67c51",
+                    "mixHash" : "0x948bc2eb1fddf236a513993d991b3581e9d99ec0db3890a9274c92a7ad2cb4af",
+                    "nonce" : "0x5adf050f43fa9ec4",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
                     "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a01405c27216e0294ad1e6731b13406a88178c532a4d14d08006edd48ef9ddad90883bae88891d7b7762f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0948bc2eb1fddf236a513993d991b3581e9d99ec0db3890a9274c92a7ad2cb4af885adf050f43fa9ec4f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed149c5175ec3d855b07156dc8587216a5b7a25580abdb14a114794b3b3afb5d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x64c521245ea31e39dfd6e927228fe0ef5ad1eaf2dc49c196d11a816c8ba67c51",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_Metropolis" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x91a9beb6f71f37769d7246ee057fed5590b5fb2f1600c9ac130a49cd53c265e8",
-                    "mixHash" : "0x2e16d218dbbcb8b9e865468fd554084037887ea7df3409c0f3334fad6694ae31",
-                    "nonce" : "0xf21ce94c3ef2879e",
+                    "hash" : "0xac4b4a9da3b5beaa206b4fde09f5a24a1f24337948e5ed4cede0cfb017038112",
+                    "mixHash" : "0x38e7881615fbc74334d0d8c0cc27a04377d68f20ab241a6e9aec27f6b01c1b39",
+                    "nonce" : "0xe18cca1b00c53f52",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
-                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a02e16d218dbbcb8b9e865468fd554084037887ea7df3409c0f3334fad6694ae3188f21ce94c3ef2879ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a038e7881615fbc74334d0d8c0cc27a04377d68f20ab241a6e9aec27f6b01c1b3988e18cca1b00c53f52f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91a9beb6f71f37769d7246ee057fed5590b5fb2f1600c9ac130a49cd53c265e8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xac4b4a9da3b5beaa206b4fde09f5a24a1f24337948e5ed4cede0cfb017038112",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47530",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7638ad0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "call_OOG_additionalGasCosts2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x7530",
+                    "hash" : "0x50ba7b2a3109369aafa64a4a3fb2ee71206e8d65dea2d1cedf7fd1b3526e9840",
+                    "mixHash" : "0x46dd69a8b9c5a0e7904943e913242d11ac673f9c20e2e0768958fe9c88edb015",
+                    "nonce" : "0x0abe6ed773e8f376",
+                    "number" : "0x01",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a046dd69a8b9c5a0e7904943e913242d11ac673f9c20e2e0768958fe9c88edb015880abe6ed773e8f376f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7530",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
+                        "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x50ba7b2a3109369aafa64a4a3fb2ee71206e8d65dea2d1cedf7fd1b3526e9840",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_d0g0v0.json
index be8275b35..a5ea74d6f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcall_00_OOGE_d0g0v0_EIP150" : {
+    "callcall_00_OOGE_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/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0xb137364ce868312c8c65079853f71a2f19817ebf2039b6025f94ce7ba19f9bf8",
-                    "mixHash" : "0xcbccccdaf0a4ba7acd018e8dba033360c7f12b7ee699b062257b475394d76c0f",
-                    "nonce" : "0xa989e1f558e5f950",
+                    "hash" : "0x6e089e0a67463b6bd26124bec7c0d661463571fad62b2e310d4ec84077a8db4d",
+                    "mixHash" : "0xc117daa244133005877b8d22205275c68591c2cf7bf122186beea183d8f8c0d1",
+                    "nonce" : "0xc439387f7fb64984",
                     "number" : "0x01",
                     "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "0x220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
-                    "stateRoot" : "0x98378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0xb6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0cbccccdaf0a4ba7acd018e8dba033360c7f12b7ee699b062257b475394d76c0f88a989e1f558e5f950f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0c117daa244133005877b8d22205275c68591c2cf7bf122186beea183d8f8c0d188c439387f7fb64984f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb137364ce868312c8c65079853f71a2f19817ebf2039b6025f94ce7ba19f9bf8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6e089e0a67463b6bd26124bec7c0d661463571fad62b2e310d4ec84077a8db4d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -133,10 +140,10 @@
             }
         }
     },
-    "callcall_00_OOGE_d0g0v0_EIP158" : {
+    "callcall_00_OOGE_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/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -148,9 +155,150 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0x28aae3c0fc6df5fc4d79da80a6754d5e54696cf0a67d2bbca9b49c3757d4f92f",
-                    "mixHash" : "0x02404e2aa1de2b4f02c0002447c071f9073307991daa4762f9b2ac0c1173ea52",
-                    "nonce" : "0x1e700e6655d7b653",
+                    "hash" : "0xe8531f8501314ff23206b20eabb9f90ed5f461b6b13235502d636a2890f5739f",
+                    "mixHash" : "0x53c72aaa17251935626c9ff403fdfb7e31c4265c5967982f3e717e00585c05b6",
+                    "nonce" : "0x0dc36620cd843a49",
+                    "number" : "0x01",
+                    "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0xb6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a053c72aaa17251935626c9ff403fdfb7e31c4265c5967982f3e717e00585c05b6880dc36620cd843a49f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe8531f8501314ff23206b20eabb9f90ed5f461b6b13235502d636a2890f5739f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50798",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762f868",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x2b88907bb986522b6dc8289ff4271464feef68bff5a526c9f809e964dbeefc69",
+                    "mixHash" : "0x9ca7cf80527f80903b0f7d6b4fca74d4bf4d5bf73771258c9071e4498fc674ff",
+                    "nonce" : "0x65918edd73926f38",
                     "number" : "0x01",
                     "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
                     "receiptTrie" : "0x220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
@@ -159,7 +307,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a002404e2aa1de2b4f02c0002447c071f9073307991daa4762f9b2ac0c1173ea52881e700e6655d7b653f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a09ca7cf80527f80903b0f7d6b4fca74d4bf4d5bf73771258c9071e4498fc674ff8865918edd73926f38f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -196,8 +344,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28aae3c0fc6df5fc4d79da80a6754d5e54696cf0a67d2bbca9b49c3757d4f92f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2b88907bb986522b6dc8289ff4271464feef68bff5a526c9f809e964dbeefc69",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -267,10 +415,10 @@
             }
         }
     },
-    "callcall_00_OOGE_d0g0v0_Frontier" : {
+    "callcall_00_OOGE_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/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +429,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010270",
-                    "hash" : "0x9709c05ada5172a0a55a8c49c13e040bf23199999d488c47b6ccf650ba68b734",
-                    "mixHash" : "0xcc76feb21d2e42238f9cc59a314b1c2ea3cbb433641c8e34495ff711c1d48a99",
-                    "nonce" : "0x7cc2cfa5268e8b14",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0xc737561e1519aa5e5073df49253b69a0ca00b49e335ac9fdb3a43b937738d1cd",
+                    "mixHash" : "0x2fe53ad178b862640b5e301ac20ccea8b4e0cfe14334879bfe8af3fe362a9a26",
+                    "nonce" : "0x7ea1a0ac787466bc",
                     "number" : "0x01",
                     "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "0x4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
-                    "stateRoot" : "0x85081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dba",
+                    "receiptTrie" : "0x220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769",
+                    "stateRoot" : "0x98378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0cc76feb21d2e42238f9cc59a314b1c2ea3cbb433641c8e34495ff711c1d48a99887cc2cfa5268e8b14f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098378960c186988a90a8eea21c10fbd4ab6ec3db98a38bfaa030d69dd42d3d07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0220f7b3978b9aff403a01d0d3dd6f804f9679970965d2ee37d7806ad36968769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a02fe53ad178b862640b5e301ac20ccea8b4e0cfe14334879bfe8af3fe362a9a26887ea1a0ac787466bcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -330,8 +478,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9709c05ada5172a0a55a8c49c13e040bf23199999d488c47b6ccf650ba68b734",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc737561e1519aa5e5073df49253b69a0ca00b49e335ac9fdb3a43b937738d1cd",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,14 +504,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50270",
+                "balance" : "0x4563918244f50798",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd90",
+                "balance" : "0x0de0b6b3a762f868",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -401,10 +549,10 @@
             }
         }
     },
-    "callcall_00_OOGE_d0g0v0_Homestead" : {
+    "callcall_00_OOGE_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/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -416,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "0xe6565db1efb17fac6a6039a18f0cc51dc33ca25e17432478619dd99dccb356ce",
-                    "mixHash" : "0xbe1de2757a149c1c8957bf6660f3d2e189df3082ff1dbfbe3c514089dab4e75d",
-                    "nonce" : "0x56667240125055cc",
+                    "hash" : "0x68deca1353e3d5936b232192f70c10cc1cb44b60f9c064fc18df6360f645c132",
+                    "mixHash" : "0x7d8ee8be3cfad24abac305850b9ada11d186e228f76989a1f411c40c2592513d",
+                    "nonce" : "0x96f80ec194de5765",
                     "number" : "0x01",
                     "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
                     "receiptTrie" : "0x4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
@@ -427,7 +575,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0be1de2757a149c1c8957bf6660f3d2e189df3082ff1dbfbe3c514089dab4e75d8856667240125055ccf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a07d8ee8be3cfad24abac305850b9ada11d186e228f76989a1f411c40c2592513d8896f80ec194de5765f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -464,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6565db1efb17fac6a6039a18f0cc51dc33ca25e17432478619dd99dccb356ce",
-        "network" : "Homestead",
+        "lastblockhash" : "0x68deca1353e3d5936b232192f70c10cc1cb44b60f9c064fc18df6360f645c132",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -535,10 +683,10 @@
             }
         }
     },
-    "callcall_00_OOGE_d0g0v0_Metropolis" : {
+    "callcall_00_OOGE_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/stCallCodes/callcall_00_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -549,19 +697,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010798",
-                    "hash" : "0xbec8993df50ef6b49393e6dd19562d20800c7dbd7706a90db8200cd62f6813af",
-                    "mixHash" : "0x4e5f21dc16a8a6b68572b45e8c42df54183252a3d55ff9607695d1b061fca28f",
-                    "nonce" : "0x37ba4c5f43ac809c",
+                    "gasUsed" : "0x010270",
+                    "hash" : "0x5917259eb7e79e69dad0aba82ee1d4f21ab0f8bab43b175d52f8a25be6b80c33",
+                    "mixHash" : "0xcc7f0ed3baf7ee786aa63ff8a8ca4e133734af2e57ab25bd9cd862f525878bd2",
+                    "nonce" : "0xf29c50c3bc3a472e",
                     "number" : "0x01",
                     "parentHash" : "0x0379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23d",
-                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
-                    "stateRoot" : "0xb6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800",
+                    "receiptTrie" : "0x4a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903",
+                    "stateRoot" : "0x85081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6126ffb510bf0abe100a54417b0ee6d468ef6a46a64bb9d659ad4b939cad800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a04e5f21dc16a8a6b68572b45e8c42df54183252a3d55ff9607695d1b061fca28f8837ba4c5f43ac809cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00379427c7abea53abf13a0b720acb05ce511d81a82702bf6ea7fee1593f1d23da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa085081610b5b467d98fde2030a8124ead8f5ae6ec905d75345b3343e7e50e1dbaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04a7cdb2c2a856c97a978a7739c87a98490743b723463befd42b3de365cdc2903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0cc7f0ed3baf7ee786aa63ff8a8ca4e133734af2e57ab25bd9cd862f525878bd288f29c50c3bc3a472ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -598,16 +746,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05cd3320021cc290720486bc424145b3e442f31f7a70e4235cf0ac8ba371e4347a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbec8993df50ef6b49393e6dd19562d20800c7dbd7706a90db8200cd62f6813af",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5917259eb7e79e69dad0aba82ee1d4f21ab0f8bab43b175d52f8a25be6b80c33",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -631,14 +772,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50798",
+                "balance" : "0x4563918244f50270",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f868",
+                "balance" : "0x0de0b6b3a762fd90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json
index 8e5c21f1b..8c315905b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP150" : {
+    "callcall_00_OOGE_valueTransfer_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/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf9bb",
-                    "hash" : "0x831ebefa0c595add68880c89b43d19ce1945413337dcd672e43f03f64bafbe45",
-                    "mixHash" : "0x4edcbdc689953188096682651677d9ead6020a9e662f29697e1411d527fdfcac",
-                    "nonce" : "0xc247e32fab24f7cd",
+                    "hash" : "0x175b60f00e80c699a409bc8f329ab8d83d326a8a7ce99b8d0a51861813281d36",
+                    "mixHash" : "0x2842617d3a1e6e9d843aaafa5d04f1cbf4113f08147962430d06bba031cba8db",
+                    "nonce" : "0x54015d36f44915ee",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
-                    "stateRoot" : "0x15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
+                    "receiptTrie" : "0x17bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7",
+                    "stateRoot" : "0xe6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a04edcbdc689953188096682651677d9ead6020a9e662f29697e1411d527fdfcac88c247e32fab24f7cdf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0ba08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba017bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a02842617d3a1e6e9d843aaafa5d04f1cbf4113f08147962430d06bba031cba8db8854015d36f44915eef882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x831ebefa0c595add68880c89b43d19ce1945413337dcd672e43f03f64bafbe45",
-        "network" : "EIP150",
+        "lastblockhash" : "0x175b60f00e80c699a409bc8f329ab8d83d326a8a7ce99b8d0a51861813281d36",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffec",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
@@ -133,10 +140,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP158" : {
+    "callcall_00_OOGE_valueTransfer_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/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -148,18 +155,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf9bb",
-                    "hash" : "0xc1617e1eaa910932782005e46667f03be537e83833fa2898b639c6c3c7f5f6c9",
-                    "mixHash" : "0xd59c963ee4b8605dde09092180c7466041bdd58e22f1154500a5fbfbdb9dd917",
-                    "nonce" : "0xe965350e8e89627b",
+                    "hash" : "0xd725b68f3106f33802b309d2fa6ab3b30e88fc1100bf6fa712f11daf5a6af4e9",
+                    "mixHash" : "0x1df599514b83f16ae626f1e2934f6cb38300a940c23b3acfdb464505e957afe8",
+                    "nonce" : "0x784da49eea566a99",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
-                    "stateRoot" : "0x15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
+                    "receiptTrie" : "0x17bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7",
+                    "stateRoot" : "0xe6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a0d59c963ee4b8605dde09092180c7466041bdd58e22f1154500a5fbfbdb9dd91788e965350e8e89627bf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0ba08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba017bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a01df599514b83f16ae626f1e2934f6cb38300a940c23b3acfdb464505e957afe888784da49eea566a99f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -196,9 +203,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1617e1eaa910932782005e46667f03be537e83833fa2898b639c6c3c7f5f6c9",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd725b68f3106f33802b309d2fa6ab3b30e88fc1100bf6fa712f11daf5a6af4e9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffec",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
@@ -267,10 +281,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_Frontier" : {
+    "callcall_00_OOGE_valueTransfer_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/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +295,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xf1b09bb415de82d60bcb2e832e1f9b109e2f9085913828fff3a58b483580b1a2",
-                    "mixHash" : "0x473c3f1c6d9134f816f45ba509632509e31d7428001e03fcc2a045736007cef7",
-                    "nonce" : "0x3cd80b19ecd1fd19",
+                    "gasUsed" : "0xf9bb",
+                    "hash" : "0xa00183a48a7e6e68bb1f33ebe9468ac7b3c67484f147a3d055a53e0bdf6580ec",
+                    "mixHash" : "0x099ee64436e540836e5ccc095ccd968d89a0690c64ce02d4c257e40171a6f78c",
+                    "nonce" : "0x6f1c10405712992c",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
-                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
+                    "receiptTrie" : "0x0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
+                    "stateRoot" : "0x15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0473c3f1c6d9134f816f45ba509632509e31d7428001e03fcc2a045736007cef7883cd80b19ecd1fd19f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a0099ee64436e540836e5ccc095ccd968d89a0690c64ce02d4c257e40171a6f78c886f1c10405712992cf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -330,10 +344,48 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1b09bb415de82d60bcb2e832e1f9b109e2f9085913828fff3a58b483580b1a2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa00183a48a7e6e68bb1f33ebe9468ac7b3c67484f147a3d055a53e0bdf6580ec",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffec",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x14",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f9bb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630645",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -354,15 +406,112 @@
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf9bb",
+                    "hash" : "0xd70293c7ad9c5808b5b1f666f62f30c086d3a4fe469faf3fd92e17462ab48646",
+                    "mixHash" : "0xaf0d7edcfb453632f82788380dbcb70a8c45c9387c170a97bc0ad197497040c1",
+                    "nonce" : "0xc5ed197b66ae0d6b",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x0dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6f",
+                    "stateRoot" : "0x15920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015920350ea0fb62e6140ece8143598e4a8a2aeaabc11a5571e7c879ed895a838a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba00dde607a96c1c9e858889c41769ff4b7748f4c265450845fce50e4e8cef3ae6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a0af0d7edcfb453632f82788380dbcb70a8c45c9387c170a97bc0ad197497040c188c5ed197b66ae0d6bf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3c",
+                        "s" : "0x57b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd70293c7ad9c5808b5b1f666f62f30c086d3a4fe469faf3fd92e17462ab48646",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffec",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x14",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
+                "balance" : "0x4563918244f4f9bb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
+                "balance" : "0x0de0b6b3a7630645",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -400,10 +549,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_Homestead" : {
+    "callcall_00_OOGE_valueTransfer_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/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -415,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xe20df2b98a3febb2ad9f47dd65a46025406613e71f74a27f166de945012bf959",
-                    "mixHash" : "0xe26ebe42c64cbbdde88808263966a8c4d2371851f96ff0de1d8c63021798977f",
-                    "nonce" : "0xf4dfe99a091599d1",
+                    "hash" : "0xbde2bd90f643e53958cd03fc3f6aaad6fa469219a0c08361a8822cc822be6d46",
+                    "mixHash" : "0xdd4594860502679062e432fa74ac5494b556a550efe9968c1d765de34736e77d",
+                    "nonce" : "0x12b6a7f0f96927d1",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
                     "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
@@ -426,7 +575,7 @@
                     "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0e26ebe42c64cbbdde88808263966a8c4d2371851f96ff0de1d8c63021798977f88f4dfe99a091599d1f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0dd4594860502679062e432fa74ac5494b556a550efe9968c1d765de34736e77d8812b6a7f0f96927d1f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -463,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe20df2b98a3febb2ad9f47dd65a46025406613e71f74a27f166de945012bf959",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbde2bd90f643e53958cd03fc3f6aaad6fa469219a0c08361a8822cc822be6d46",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -533,10 +682,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_Metropolis" : {
+    "callcall_00_OOGE_valueTransfer_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/stCallCodes/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -547,19 +696,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf9bb",
-                    "hash" : "0x17332bd70588bf27dda25015277800193a4c835baad78cfc981345bfd35ea341",
-                    "mixHash" : "0x4caeda7cc4b9698e5e265237d147148ec8c887b2acb720d53411600d46582697",
-                    "nonce" : "0x3586108de3e98438",
+                    "gasUsed" : "0x029fe0",
+                    "hash" : "0xc5a27e6dba75353e244750ecc00241faeffd10ad44cd7f0d49362dcdc2504acc",
+                    "mixHash" : "0x347aab301b3c645a700b5152d7528e9fc5e5cbee808063664f50d69b9ad97852",
+                    "nonce" : "0x5358f66424aabda5",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x17bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7",
-                    "stateRoot" : "0xe6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0b",
+                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
+                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6e8e37e713b8594a7e3245a21999bf6c4cff24bf4e7658da7e24c3723795a0ba08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba017bb47f6548c6139620913abeff601756131c332f8d908b7a748d4e8b277cbc7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f9bb8203e880a04caeda7cc4b9698e5e265237d147148ec8c887b2acb720d53411600d46582697883586108de3e98438f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a08996c815389812f6f94db44e63cc233cef311968612a3af5d0a17c1f1411631ba0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0347aab301b3c645a700b5152d7528e9fc5e5cbee808063664f50d69b9ad97852885358f66424aabda5f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000001f41ba020bfa20e35cb3d8df6b33c0da12b82fbae3a6a0671bf5d948b1362c3cb46ab3ca057b1137d0602103966b5df5b0f5fb3310519139ce2e85294d0e776703a533800c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -596,26 +745,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17332bd70588bf27dda25015277800193a4c835baad78cfc981345bfd35ea341",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc5a27e6dba75353e244750ecc00241faeffd10ad44cd7f0d49362dcdc2504acc",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffec",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x14",
+                "balance" : "0x00",
                 "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
                 "nonce" : "0x00",
                 "storage" : {
@@ -629,14 +770,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f9bb",
+                "balance" : "0x4563918244f69fe0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630645",
+                "balance" : "0x0de0b6b3a7616020",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json
index 6c8a62124..621050a1c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP150" : {
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010b4f",
-                    "hash" : "0xf2891a56fe380ac5e84f3130d2f5587324b358c6f32a96a2a6dbd6f55d4a1129",
-                    "mixHash" : "0x355a63fe0121b7d32ce55591bd6ed5dcfc646c8bce87e32003e543cd3a1b3eea",
-                    "nonce" : "0x68bfeec91a050b97",
+                    "hash" : "0x966e3cd5ba26ccaf841453abf63d3c7d3c9d80ea6b7ab1b7df86d549498822ce",
+                    "mixHash" : "0xb1b936cea1d8b9dd303c4b2c6f720b73710bc83f2c38c078737c7ecd2ce0cbe8",
+                    "nonce" : "0xff9ee191ed8803b7",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
-                    "stateRoot" : "0x4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
+                    "receiptTrie" : "0xda16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89",
+                    "stateRoot" : "0xb0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a0355a63fe0121b7d32ce55591bd6ed5dcfc646c8bce87e32003e543cd3a1b3eea8868bfeec91a050b97f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0da16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a0b1b936cea1d8b9dd303c4b2c6f720b73710bc83f2c38c078737c7ecd2ce0cbe888ff9ee191ed8803b7f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2891a56fe380ac5e84f3130d2f5587324b358c6f32a96a2a6dbd6f55d4a1129",
-        "network" : "EIP150",
+        "lastblockhash" : "0x966e3cd5ba26ccaf841453abf63d3c7d3c9d80ea6b7ab1b7df86d549498822ce",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffec",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
@@ -133,10 +140,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP158" : {
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -148,18 +155,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010b4f",
-                    "hash" : "0x059bb5769e5528f549f89d91ebb8be67471dfed8207e6f354da52e4408da00cb",
-                    "mixHash" : "0x32bda5fe658b1fac44ceba93cc73711111f69a544efd8f5ed25845117ea1ab7d",
-                    "nonce" : "0x467e05c4e56b700e",
+                    "hash" : "0x567b281dc241fea852ecb8791602ef779ba59a70c94441da926c332873168830",
+                    "mixHash" : "0xeccfa3be35e1fbca6c48ebffccdaab9d39c89bc86f8617de94d9207e8ab12b83",
+                    "nonce" : "0x19ebaaad4efbd791",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
-                    "stateRoot" : "0x4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
+                    "receiptTrie" : "0xda16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89",
+                    "stateRoot" : "0xb0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a032bda5fe658b1fac44ceba93cc73711111f69a544efd8f5ed25845117ea1ab7d88467e05c4e56b700ef882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0da16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a0eccfa3be35e1fbca6c48ebffccdaab9d39c89bc86f8617de94d9207e8ab12b838819ebaaad4efbd791f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
@@ -196,9 +203,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x059bb5769e5528f549f89d91ebb8be67471dfed8207e6f354da52e4408da00cb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x567b281dc241fea852ecb8791602ef779ba59a70c94441da926c332873168830",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffec",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
@@ -267,10 +281,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_Frontier" : {
+    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +295,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xfa48997aef79ae22b6161ac9e2d35ec29d07b565da3b35bde014c8dc0f985290",
-                    "mixHash" : "0xd59aaafd5303e4089f15819866c61c6d91e838407d277dd93069325ae1dfedc1",
-                    "nonce" : "0xb43dab6f0711e49b",
+                    "gasUsed" : "0x010b4f",
+                    "hash" : "0x127f57799cd6b1ee7ba06b744b44b10220156a6bba929e4b12d9473d45aa56ee",
+                    "mixHash" : "0x7307ed42fb8541b2a636131c86afdf3166c95589dcb399465a21b4e2380b9011",
+                    "nonce" : "0x02df9a076a7a3a92",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
-                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
+                    "receiptTrie" : "0x6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
+                    "stateRoot" : "0x4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0d59aaafd5303e4089f15819866c61c6d91e838407d277dd93069325ae1dfedc188b43dab6f0711e49bf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a07307ed42fb8541b2a636131c86afdf3166c95589dcb399465a21b4e2380b90118802df9a076a7a3a92f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
@@ -330,10 +344,48 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa48997aef79ae22b6161ac9e2d35ec29d07b565da3b35bde014c8dc0f985290",
-        "network" : "Frontier",
+        "lastblockhash" : "0x127f57799cd6b1ee7ba06b744b44b10220156a6bba929e4b12d9473d45aa56ee",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffec",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x14",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50b4f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762f4b1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -354,15 +406,112 @@
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d1g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x010b4f",
+                    "hash" : "0xdf56474d2537f506faf88cb969411e8e1bd736c6aba79dae28b1ea29347624ee",
+                    "mixHash" : "0xe38f563c5bc5174fe5db6d6294e798fd67e9934c9a7ec0600f9f80e7d7680b54",
+                    "nonce" : "0x6903cff914d4961a",
+                    "number" : "0x01",
+                    "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+                    "receiptTrie" : "0x6a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45",
+                    "stateRoot" : "0x4d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d3a54d5fcddae7e73c98a040fb644445890a8b2718f2d9f8f8cd9e02ed8d5ada0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a06a90697ee4f70cf02d574101a4704d5d22090af674831e2ecae08c63e7637e45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a0e38f563c5bc5174fe5db6d6294e798fd67e9934c9a7ec0600f9f80e7d7680b54886903cff914d4961af882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506",
+                        "s" : "0x73f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdf56474d2537f506faf88cb969411e8e1bd736c6aba79dae28b1ea29347624ee",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffec",
+                "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x14",
+                "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
+                "balance" : "0x4563918244f50b4f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
+                "balance" : "0x0de0b6b3a762f4b1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -400,10 +549,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_Homestead" : {
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -415,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xcb0d7542a90c33176dbc3c30635f5957d81d22814e60f47c9636df65526854d2",
-                    "mixHash" : "0xacf6598460a3fabb76ec997cb37b35fa90a91f6b6436f52ed64946eb9a0b1bb4",
-                    "nonce" : "0xe185571360545469",
+                    "hash" : "0x686af88bf9ede2737b50dfd17c1dce3abf6d16468f2de88a77dcb375c5072f02",
+                    "mixHash" : "0x41e9139448fd9c34916b13fcc5707e7ede4f9e0e42df0df67af72add7f211916",
+                    "nonce" : "0x33921943adeea05c",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
                     "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
@@ -426,7 +575,7 @@
                     "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0acf6598460a3fabb76ec997cb37b35fa90a91f6b6436f52ed64946eb9a0b1bb488e185571360545469f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a041e9139448fd9c34916b13fcc5707e7ede4f9e0e42df0df67af72add7f2119168833921943adeea05cf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
@@ -463,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb0d7542a90c33176dbc3c30635f5957d81d22814e60f47c9636df65526854d2",
-        "network" : "Homestead",
+        "lastblockhash" : "0x686af88bf9ede2737b50dfd17c1dce3abf6d16468f2de88a77dcb375c5072f02",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -533,10 +682,10 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d1g0v0_Metropolis" : {
+    "callcall_00_OOGE_valueTransfer_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_OOGE_valueTransfer_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -547,19 +696,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010b4f",
-                    "hash" : "0xeb4efd5b5877e304df4d3a9e173396bb9719c621a0715d72cc41ce7e2495d353",
-                    "mixHash" : "0x6f69b873182e7a9fe90e455e082b7b21421766ab53ff676e25de898152767d8a",
-                    "nonce" : "0x5a3ef749766f3592",
+                    "gasUsed" : "0x029fe0",
+                    "hash" : "0x2a9d76e6680ee9ebe1e8a134d0315b13dd999f01b3e9c8b55ff844b53b71a7d9",
+                    "mixHash" : "0x40dd0ef148e4858795a46f9bdbd8e92af7e199fe5030d5630a608da3d35087c5",
+                    "nonce" : "0x125ff71ffa81245f",
                     "number" : "0x01",
                     "parentHash" : "0x2bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eb",
-                    "receiptTrie" : "0xda16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89",
-                    "stateRoot" : "0xb0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95",
+                    "receiptTrie" : "0x092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1",
+                    "stateRoot" : "0x9b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0644acf59ec5ef6db5598789df1fd21430169ab2309cbd6a354083f59217f95a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0da16c12e51914ab215b6da0ab16433ac8902f221b0f4802cc0b22164a5b6ce89b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083010b4f8203e880a06f69b873182e7a9fe90e455e082b7b21421766ab53ff676e25de898152767d8a885a3ef749766f3592f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
+                "rlp" : "0xf90281f901f9a02bf32029a26b71cdea3708f1530572d05824644d65a94388683b8a82d24df4eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b3caae60ce1456623137b0a9314056bccf6e3a084010bcce62ff47f371101a7a0076dd8dc39eae7f3cb8f530d0f5c281890f734d60ba679c8ff02ffb9bf1cf114a0092c1ef7845547e68ad589bb47550d140cecf0a9df0f1b9b02ef5955e9347ed1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a040dd0ef148e4858795a46f9bdbd8e92af7e199fe5030d5630a608da3d35087c588125ff71ffa81245ff882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000000000000000000000000000000000000000013881ca0c10d8ea27b4847e71d7df82147ba29d0421ba51e02bb221071b899c4c1681506a073f65f8e46853c4df4d0c36a9ab41a77b3bfe826d0c685607385fd9be144f187c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000001388",
@@ -596,26 +745,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08de2bf97f4ab8f58b7e672ff61136a33bf89560a371d214c9cf7cbf38759b47fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb4efd5b5877e304df4d3a9e173396bb9719c621a0715d72cc41ce7e2495d353",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2a9d76e6680ee9ebe1e8a134d0315b13dd999f01b3e9c8b55ff844b53b71a7d9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffec",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x14",
+                "balance" : "0x00",
                 "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
                 "nonce" : "0x00",
                 "storage" : {
@@ -629,14 +770,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50b4f",
+                "balance" : "0x4563918244f69fe0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f4b1",
+                "balance" : "0x0de0b6b3a7616020",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
index d793222d3..8f9698dde 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcall_00_SuicideEnd_d0g0v0_EIP150" : {
+    "callcall_00_SuicideEnd_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/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x60adbb1622c784c2354d709b857a3e8d0681de57e5931aca0363f8065fdb67d2",
-                    "mixHash" : "0x972bd34a12013ff2ebbc47a12e8ed12f8fba2e6629dfd1fee8da0f04857c0225",
-                    "nonce" : "0x4cd89d85db046832",
+                    "hash" : "0xd1f7c20a7aee1c8bb1059d811014d36f00119a1fe369d657941040be48b87a72",
+                    "mixHash" : "0x47fdcdd17ead4f87044edb32af81b6d3203503ad12666a71feefd94b8c07eab0",
+                    "nonce" : "0x8b1a3996887410e0",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
-                    "stateRoot" : "0x591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0972bd34a12013ff2ebbc47a12e8ed12f8fba2e6629dfd1fee8da0f04857c0225884cd89d85db046832f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a047fdcdd17ead4f87044edb32af81b6d3203503ad12666a71feefd94b8c07eab0888b1a3996887410e0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60adbb1622c784c2354d709b857a3e8d0681de57e5931aca0363f8065fdb67d2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd1f7c20a7aee1c8bb1059d811014d36f00119a1fe369d657941040be48b87a72",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -127,10 +134,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_EIP158" : {
+    "callcall_00_SuicideEnd_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/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,9 +149,144 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x8ea2257cf825b92af86c4005257514529844608d99495796fa1c69ae1ea4e475",
-                    "mixHash" : "0xebb195376afc6400a16e760a00574a27b4820c4a871bf2e2a42ce31469f57d82",
-                    "nonce" : "0xe5865d04334df5e9",
+                    "hash" : "0x6c754fe9ffa7dbc7c65f286e5d4fcf2eff01fa3e0c51cbb9ac7e16e81b9879d6",
+                    "mixHash" : "0x25852de6e1cdffeca7a95ae009563462f48eceafebb0f03f789a3aaa9fac826f",
+                    "nonce" : "0x25034263ff4ebdde",
+                    "number" : "0x01",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a025852de6e1cdffeca7a95ae009563462f48eceafebb0f03f789a3aaa9fac826f8825034263ff4ebddef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6c754fe9ffa7dbc7c65f286e5d4fcf2eff01fa3e0c51cbb9ac7e16e81b9879d6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f7ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630813",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xabff67b73a98fd8b2448c4498dd8774d37233fdf5a24f41f247bdf6e48fc8106",
+                    "mixHash" : "0x0af5554bb2cd85bee5ebbd9738863f9b4d60f6a46f29443e11059298aab47813",
+                    "nonce" : "0xb8f0b1cc2f81cf65",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
                     "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
@@ -153,7 +295,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0ebb195376afc6400a16e760a00574a27b4820c4a871bf2e2a42ce31469f57d8288e5865d04334df5e9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a00af5554bb2cd85bee5ebbd9738863f9b4d60f6a46f29443e11059298aab4781388b8f0b1cc2f81cf65f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,8 +332,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ea2257cf825b92af86c4005257514529844608d99495796fa1c69ae1ea4e475",
-        "network" : "EIP158",
+        "lastblockhash" : "0xabff67b73a98fd8b2448c4498dd8774d37233fdf5a24f41f247bdf6e48fc8106",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -255,10 +397,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_Frontier" : {
+    "callcall_00_SuicideEnd_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/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -269,19 +411,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3d",
-                    "hash" : "0x87f4e8a1a41a19ae56df0f17a31f052a1d54abea850b1ec8d2a012fa1a88bd96",
-                    "mixHash" : "0x064e4fb57d16483b58fdcbc18b91a7cfbd7d945ac6c83f70c0360c64a07be3ec",
-                    "nonce" : "0x95871bf9a1482b84",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0x244244d1bf71a285f43138d912bef4f8032e011091249eb49d8cfd2c79c98692",
+                    "mixHash" : "0xabed9e3e02a9953c909f091bd463d933e0d00762785ef205546c6c5a79d4ed4a",
+                    "nonce" : "0xf67be072f65ee319",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
-                    "stateRoot" : "0xd4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
+                    "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
+                    "stateRoot" : "0x591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0064e4fb57d16483b58fdcbc18b91a7cfbd7d945ac6c83f70c0360c64a07be3ec8895871bf9a1482b84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0abed9e3e02a9953c909f091bd463d933e0d00762785ef205546c6c5a79d4ed4a88f67be072f65ee319f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,8 +460,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87f4e8a1a41a19ae56df0f17a31f052a1d54abea850b1ec8d2a012fa1a88bd96",
-        "network" : "Frontier",
+        "lastblockhash" : "0x244244d1bf71a285f43138d912bef4f8032e011091249eb49d8cfd2c79c98692",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -338,14 +480,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3d",
+                "balance" : "0x4563918244f4f7ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c3",
+                "balance" : "0x0de0b6b3a7630813",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -383,10 +525,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_Homestead" : {
+    "callcall_00_SuicideEnd_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/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -398,9 +540,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0xb071c44151d4c00166e7f158ec1c44c59156ee85172ba15cb81cda5b48c3bc92",
-                    "mixHash" : "0x306b9b3d4dd1b04e1210f4a7e7363f125a2d07c2942dcb912c059479340d1466",
-                    "nonce" : "0x03b0e897807ad764",
+                    "hash" : "0x083757ad3e95eb4a06ac4a573b06d55db4105c1ef7f87a72bd562d58243d13cd",
+                    "mixHash" : "0xd9a4af42cf2d8fefbd3f806bdfa31776469b15b0a7be05a83e92a824c2030986",
+                    "nonce" : "0x1462391809187d1a",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
                     "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
@@ -409,7 +551,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0306b9b3d4dd1b04e1210f4a7e7363f125a2d07c2942dcb912c059479340d14668803b0e897807ad764f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0d9a4af42cf2d8fefbd3f806bdfa31776469b15b0a7be05a83e92a824c2030986881462391809187d1af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -446,8 +588,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb071c44151d4c00166e7f158ec1c44c59156ee85172ba15cb81cda5b48c3bc92",
-        "network" : "Homestead",
+        "lastblockhash" : "0x083757ad3e95eb4a06ac4a573b06d55db4105c1ef7f87a72bd562d58243d13cd",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -511,10 +653,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcall_00_SuicideEnd_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/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -525,19 +667,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ed",
-                    "hash" : "0x33dc317e9e91d7b8bcce1e0728f6503f5717c7a8c3d530f0c6a54b73a03854a1",
-                    "mixHash" : "0xbce28bd0655238dbd7447314842e562ed6ea405f6c79c8ee36fc185ee86c8c2d",
-                    "nonce" : "0x540cfec846e47c70",
+                    "gasUsed" : "0xdf3d",
+                    "hash" : "0x4ff5ca6fe5cfc53e775cca67dacbb06874254ddd47351e26e860e0fb82cb2de9",
+                    "mixHash" : "0x82c3b6782a5eceb02c17a29a53e9e399614ad14d635e356dcabd61d3f456e777",
+                    "nonce" : "0xb565093a8f63d53a",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
-                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
+                    "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
+                    "stateRoot" : "0xd4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0bce28bd0655238dbd7447314842e562ed6ea405f6c79c8ee36fc185ee86c8c2d88540cfec846e47c70f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a082c3b6782a5eceb02c17a29a53e9e399614ad14d635e356dcabd61d3f456e77788b565093a8f63d53af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -574,16 +716,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33dc317e9e91d7b8bcce1e0728f6503f5717c7a8c3d530f0c6a54b73a03854a1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4ff5ca6fe5cfc53e775cca67dacbb06874254ddd47351e26e860e0fb82cb2de9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -601,14 +736,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ed",
+                "balance" : "0x4563918244f4df3d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630813",
+                "balance" : "0x0de0b6b3a76320c3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_d0g0v0.json
index 8c0ecc96f..0f5b2bed7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcall_00_d0g0v0_EIP150" : {
+    "callcall_00_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/stCallCodes/callcall_00_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0x474e48d11d18e96742b0d6d47c1a1aaf7b389ab7eac29c0f07e4254e5eefe8a9",
-                    "mixHash" : "0x3981b3e405049b922f3d82374a383c53ad902d8daa389ac739619c38d3b01dcb",
-                    "nonce" : "0x0cac8e38c7ef7041",
+                    "hash" : "0x8ee74620de5846c1ab6ff1d244a039e88eeb5104524d4aeb870579489b9e9d1d",
+                    "mixHash" : "0x7b85e3679caf87e26a963ed320893718c527b63044eb1433398191e0071824ef",
+                    "nonce" : "0x964d516c2ddd3e18",
                     "number" : "0x01",
                     "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "0x448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
-                    "stateRoot" : "0xcae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0xc6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a03981b3e405049b922f3d82374a383c53ad902d8daa389ac739619c38d3b01dcb880cac8e38c7ef7041f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a07b85e3679caf87e26a963ed320893718c527b63044eb1433398191e0071824ef88964d516c2ddd3e18f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x474e48d11d18e96742b0d6d47c1a1aaf7b389ab7eac29c0f07e4254e5eefe8a9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8ee74620de5846c1ab6ff1d244a039e88eeb5104524d4aeb870579489b9e9d1d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -142,10 +149,160 @@
             }
         }
     },
-    "callcall_00_d0g0v0_EIP158" : {
+    "callcall_00_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x7abf8b3ec6b91517e3276fcea37af61addc87e891f24636e45c25ab8b51e119b",
+                    "mixHash" : "0x1af5306f0344e62f48571e2e03457231e32ee395f587a2bd61ad745358640c8b",
+                    "nonce" : "0x2e00194499366f02",
+                    "number" : "0x01",
+                    "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0xc6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a01af5306f0344e62f48571e2e03457231e32ee395f587a2bd61ad745358640c8b882e00194499366f02f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7abf8b3ec6b91517e3276fcea37af61addc87e891f24636e45c25ab8b51e119b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000001",
+                    "0x07" : "0x02",
+                    "0xe6" : "0x1000000000000000000000000000000000000002",
+                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0xec" : "0x40",
+                    "0xee" : "0x21",
+                    "0xf0" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f7997d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7606683",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_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/stCallCodes/callcall_00_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -157,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0xcedb49cb02cb3d9b978add53821aa07650a0446dc77448c3ef0e5488a01a9442",
-                    "mixHash" : "0x1aaf1dbb6a3f7ca204a08836ad0166906da71ac7cc6a2862fda37c9e99e0d1ec",
-                    "nonce" : "0x47beba4ebbb77510",
+                    "hash" : "0x06b6f183b5a1ad2858ee0157fc2e40d37355793183128bdb6b46fff6556969d5",
+                    "mixHash" : "0x348744663f90e86c523f7e99ec4b001f85fde21f736c2189682c90a93783a6b7",
+                    "nonce" : "0x86d22aebcfe71379",
                     "number" : "0x01",
                     "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
                     "receiptTrie" : "0x448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
@@ -168,7 +325,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a01aaf1dbb6a3f7ca204a08836ad0166906da71ac7cc6a2862fda37c9e99e0d1ec8847beba4ebbb77510f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0348744663f90e86c523f7e99ec4b001f85fde21f736c2189682c90a93783a6b78886d22aebcfe71379f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -205,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcedb49cb02cb3d9b978add53821aa07650a0446dc77448c3ef0e5488a01a9442",
-        "network" : "EIP158",
+        "lastblockhash" : "0x06b6f183b5a1ad2858ee0157fc2e40d37355793183128bdb6b46fff6556969d5",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -285,10 +442,10 @@
             }
         }
     },
-    "callcall_00_d0g0v0_Frontier" : {
+    "callcall_00_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/stCallCodes/callcall_00_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -299,19 +456,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x039455",
-                    "hash" : "0x00d52c9904d44e3be3937c907f3e31f78bb4eb08db21a2dc5d00172d348b3256",
-                    "mixHash" : "0x57a91278bde126a6b2f6ab6d1ab392b97bf303bd472bd9281a7b55e56f81f08b",
-                    "nonce" : "0x49af7cbf3a32570f",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x89164bee9aaf0ed334b1367b1f9ba726a0c2b6c1df07a3f4725e27536ca54509",
+                    "mixHash" : "0x4c7b2490e6312d7b881e4b18ab2a28794aeb0ae2c778523e7f9e541024f4442d",
+                    "nonce" : "0x40d8e5b379c8d466",
                     "number" : "0x01",
                     "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "0x9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
-                    "stateRoot" : "0x7390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742",
+                    "receiptTrie" : "0x448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fa",
+                    "stateRoot" : "0xcae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a057a91278bde126a6b2f6ab6d1ab392b97bf303bd472bd9281a7b55e56f81f08b8849af7cbf3a32570ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cae7faeb952aa089d9ea29d95ca485d4bd16397e1e7dedf0efd59274e8da32d0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0448556ad917a03440b824b13928620feb7736dade89e1be8bc21e17b1797d6fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a04c7b2490e6312d7b881e4b18ab2a28794aeb0ae2c778523e7f9e541024f4442d8840d8e5b379c8d466f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -348,8 +505,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00d52c9904d44e3be3937c907f3e31f78bb4eb08db21a2dc5d00172d348b3256",
-        "network" : "Frontier",
+        "lastblockhash" : "0x89164bee9aaf0ed334b1367b1f9ba726a0c2b6c1df07a3f4725e27536ca54509",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -383,14 +540,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79455",
+                "balance" : "0x4563918244f7997d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606bab",
+                "balance" : "0x0de0b6b3a7606683",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -428,10 +585,10 @@
             }
         }
     },
-    "callcall_00_d0g0v0_Homestead" : {
+    "callcall_00_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/stCallCodes/callcall_00_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -443,9 +600,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "0xf7e84e3fdbea42510cd17b115df85091d0bcb1bba3cd0255e8a5be448b56f784",
-                    "mixHash" : "0x350787f0ddbd6114ab837912e40206a924cf2c3368f67a2107b24918bec0e129",
-                    "nonce" : "0x0ba4b8c4a0ddce85",
+                    "hash" : "0x380e2d495cab5345def37be6a3a448fe605037aca8b73ecce7ab458b31127433",
+                    "mixHash" : "0x917c9672c6daa23c22c03d2b43bd041f58e569902bb56a2d7b60078fe9909221",
+                    "nonce" : "0x6dbf87dc22af3170",
                     "number" : "0x01",
                     "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
                     "receiptTrie" : "0x9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
@@ -454,7 +611,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0350787f0ddbd6114ab837912e40206a924cf2c3368f67a2107b24918bec0e129880ba4b8c4a0ddce85f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0917c9672c6daa23c22c03d2b43bd041f58e569902bb56a2d7b60078fe9909221886dbf87dc22af3170f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -491,8 +648,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7e84e3fdbea42510cd17b115df85091d0bcb1bba3cd0255e8a5be448b56f784",
-        "network" : "Homestead",
+        "lastblockhash" : "0x380e2d495cab5345def37be6a3a448fe605037aca8b73ecce7ab458b31127433",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -571,10 +728,10 @@
             }
         }
     },
-    "callcall_00_d0g0v0_Metropolis" : {
+    "callcall_00_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/stCallCodes/callcall_00_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,19 +742,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03997d",
-                    "hash" : "0xca9ceeacd3b349e2e584f0ebb6cbc5a389dd4e0a3dd9ac7c7add333eae34702b",
-                    "mixHash" : "0x6973fa52fc9bc77f9d3eeec2fa708d3a8b809d74c36b03d065219c84213ea5cb",
-                    "nonce" : "0xc0dfa6cfa2e29683",
+                    "gasUsed" : "0x039455",
+                    "hash" : "0x4e285affd3182cc9e04db926f0596d26cd88703f91273959586939ed4facbe5a",
+                    "mixHash" : "0x61f48f9c68315588ad9999c5e942bdeb95cce594536555c7b7f90bb0a6ea1c54",
+                    "nonce" : "0xe408310094f8bba7",
                     "number" : "0x01",
                     "parentHash" : "0xff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8e",
-                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
-                    "stateRoot" : "0xc6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cd",
+                    "receiptTrie" : "0x9d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38f",
+                    "stateRoot" : "0x7390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6012985c959938ab579e107957c11917eb7751125c64eeab9ce577625a966cda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a06973fa52fc9bc77f9d3eeec2fa708d3a8b809d74c36b03d065219c84213ea5cb88c0dfa6cfa2e29683f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ff0995a8ee8d092695320d6de69834e480ed9be03c6f739190e9fe8a4257bd8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07390e89e9a22ec45cf0aab5123baf889bbccc9833fc0262902ed7a41c4e8b742a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09d295d3efbab4bb5622d77e8b90ab91d09a84f1fb256ef95f70a9a6406b7a38fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a061f48f9c68315588ad9999c5e942bdeb95cce594536555c7b7f90bb0a6ea1c5488e408310094f8bba7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -634,16 +791,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ae2b0083edcbfa96299ea144cea5d0ff0682def972a6e81c67168b2845b43e9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca9ceeacd3b349e2e584f0ebb6cbc5a389dd4e0a3dd9ac7c7add333eae34702b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4e285affd3182cc9e04db926f0596d26cd88703f91273959586939ed4facbe5a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -676,14 +826,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7997d",
+                "balance" : "0x4563918244f79455",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606683",
+                "balance" : "0x0de0b6b3a7606bab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE_d0g0v0.json
index b03927c65..d3f8b9130 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_OOGE_d0g0v0_EIP150" : {
+    "callcallcall_000_OOGE_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/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0xb59e87fb1116c1129b606d329b4eb3ed2810deae82b4416cc66dc1fe3d08e0f0",
-                    "mixHash" : "0x57bcc5f7554664c0a0c4b7e136658e825d0671cf8f3fc8693383639dc2dbd560",
-                    "nonce" : "0x6866a23016c58b1a",
+                    "hash" : "0x04ccacf64713d33a4603c139151136ccac75071fa64457a584d1b17bd57bb5a1",
+                    "mixHash" : "0x63e4483d3e3c96680f64283c0256892af5cf9fac564a11b4b46450f053dfcd5e",
+                    "nonce" : "0x9389c822ce769e2c",
                     "number" : "0x01",
                     "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "0x083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
-                    "stateRoot" : "0xf833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4d",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xfbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a057bcc5f7554664c0a0c4b7e136658e825d0671cf8f3fc8693383639dc2dbd560886866a23016c58b1af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a063e4483d3e3c96680f64283c0256892af5cf9fac564a11b4b46450f053dfcd5e889389c822ce769e2cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb59e87fb1116c1129b606d329b4eb3ed2810deae82b4416cc66dc1fe3d08e0f0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x04ccacf64713d33a4603c139151136ccac75071fa64457a584d1b17bd57bb5a1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcallcall_000_OOGE_d0g0v0_EIP158" : {
+    "callcallcall_000_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x3c796cd9118b552149dfb5a8f6ba94bd4d1d755b83df8bdae0617b1fc14ae547",
+                    "mixHash" : "0xc02a60b2b204fcd4808e2fa53b0fc8d2523d346b216bab9e4f084d5dea595391",
+                    "nonce" : "0x88224fb6bd2161aa",
+                    "number" : "0x01",
+                    "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xfbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0c02a60b2b204fcd4808e2fa53b0fc8d2523d346b216bab9e4f084d5dea5953918888224fb6bd2161aaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c796cd9118b552149dfb5a8f6ba94bd4d1d755b83df8bdae0617b1fc14ae547",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_OOGE_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/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0xc5cb24db701027f21fdc1500d85790e41ba18f35b83800d6e282964af18426f1",
-                    "mixHash" : "0x8858b0653af7c4d066728ff0e63f3eea27bd6296cdbf25fa0489ab8a3016288e",
-                    "nonce" : "0xea3f06d0ad3abbd8",
+                    "hash" : "0x3ad685fc66ae4cf8436d58e5290663be0d86b918f7c850e82ef782c18c398a38",
+                    "mixHash" : "0x9f5f3c758fe0e3866e249206c70d60c69886da7f46bf10fce10314160bda73ea",
+                    "nonce" : "0xadbdaaa3a5e9ba83",
                     "number" : "0x01",
                     "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
                     "receiptTrie" : "0x083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a08858b0653af7c4d066728ff0e63f3eea27bd6296cdbf25fa0489ab8a3016288e88ea3f06d0ad3abbd8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a09f5f3c758fe0e3866e249206c70d60c69886da7f46bf10fce10314160bda73ea88adbdaaa3a5e9ba83f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5cb24db701027f21fdc1500d85790e41ba18f35b83800d6e282964af18426f1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3ad685fc66ae4cf8436d58e5290663be0d86b918f7c850e82ef782c18c398a38",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcallcall_000_OOGE_d0g0v0_Frontier" : {
+    "callcallcall_000_OOGE_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/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0xd66c7a42b29fa8429490bc492332dd257adb0feaa7d9782f8f531839db6b3f94",
-                    "mixHash" : "0x4f109939fcde4806669fa49f9f82b6a471aa8bbd2434af8c457bad6e9e7c08b4",
-                    "nonce" : "0x7a7adf93d336342d",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x0ff5e5bb33995adf1c74d1a12e1d35f19bc8e5b62843a078d82713a6ee6ade79",
+                    "mixHash" : "0xfd5ecfa72cd8c6b6e2748a16c9ab7b661b4c11ae0e2386eafbc07e28fbdca5b9",
+                    "nonce" : "0xc26aa4368c6310e4",
                     "number" : "0x01",
                     "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "0x0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
-                    "stateRoot" : "0xd61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637",
+                    "receiptTrie" : "0x083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fa",
+                    "stateRoot" : "0xf833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a04f109939fcde4806669fa49f9f82b6a471aa8bbd2434af8c457bad6e9e7c08b4887a7adf93d336342df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f833bdcc5932c719af97e86108a5ee220aecaee78dc760710437e2ce2efb6a4da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0083496e0bdae56051e8e40353eb1c7b47a0a60cb05f0450ca3bbbd4054f156fab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0fd5ecfa72cd8c6b6e2748a16c9ab7b661b4c11ae0e2386eafbc07e28fbdca5b988c26aa4368c6310e4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd66c7a42b29fa8429490bc492332dd257adb0feaa7d9782f8f531839db6b3f94",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0ff5e5bb33995adf1c74d1a12e1d35f19bc8e5b62843a078d82713a6ee6ade79",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcallcall_000_OOGE_d0g0v0_Homestead" : {
+    "callcallcall_000_OOGE_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/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0x94f064ca8d2be23c573496b0dbe139a855513bea3672a8953c269c0ba8e65e15",
-                    "mixHash" : "0x77589870c7e611bb79f1731ae2243478691a93ea99aeec10163820e33cc4759c",
-                    "nonce" : "0x1b97c725f5aa7f82",
+                    "hash" : "0x8068f20afe5f5afb52b864f58d85b0f5a0a7e57804e54ada9241b44585560f83",
+                    "mixHash" : "0x7d448d2da9300a35438953319a4a7086ddcabb364e45609d526b346f675181a8",
+                    "nonce" : "0xabaee87b8ea6cb5b",
                     "number" : "0x01",
                     "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
                     "receiptTrie" : "0x0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a077589870c7e611bb79f1731ae2243478691a93ea99aeec10163820e33cc4759c881b97c725f5aa7f82f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a07d448d2da9300a35438953319a4a7086ddcabb364e45609d526b346f675181a888abaee87b8ea6cb5bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94f064ca8d2be23c573496b0dbe139a855513bea3672a8953c269c0ba8e65e15",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8068f20afe5f5afb52b864f58d85b0f5a0a7e57804e54ada9241b44585560f83",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcallcall_000_OOGE_d0g0v0_Metropolis" : {
+    "callcallcall_000_OOGE_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/stCallCodes/callcallcall_000_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0x6db507e4fcaa1d9a8472310d3f8e54acc207b25881944943248007f1ae6cdc57",
-                    "mixHash" : "0xa551659887bce9602c119a68ac3eb5aecf1e77f8f9c764effac3122b3cd5a329",
-                    "nonce" : "0xfc8d78157cdfd41f",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0xa483c359b848f3dcd4e7e1a334ff5ff841cb3bebc882df82223d856688ebec41",
+                    "mixHash" : "0x0431632d262dc6334ae875d96e879860b2a4248515457634c5d5805fd7df1891",
+                    "nonce" : "0xf5446dc37d2cb137",
                     "number" : "0x01",
                     "parentHash" : "0x06ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0xfbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962",
+                    "receiptTrie" : "0x0a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568b",
+                    "stateRoot" : "0xd61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbd56facfe032c4b5bd1c58c4af4989779aa53d667ca85e0f31193056e995962a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a551659887bce9602c119a68ac3eb5aecf1e77f8f9c764effac3122b3cd5a32988fc8d78157cdfd41ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a006ec44caec4223674530a9ee82b2b2a14edc878b8750308cf79aa92db9c56cd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d61b524cf931cb3883e8d3975c0f59a6bfd8f85281cd15fbf501f9260a7bb637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a4c11d92fe5491273aa5f1152d81cc93efee7493040d9d78d761b33c99c568bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a00431632d262dc6334ae875d96e879860b2a4248515457634c5d5805fd7df189188f5446dc37d2cb137f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08eeb8ad3fd9eded0131e47747dc558496c97fac21006fd50504e0434fe01762ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6db507e4fcaa1d9a8472310d3f8e54acc207b25881944943248007f1ae6cdc57",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa483c359b848f3dcd4e7e1a334ff5ff841cb3bebc882df82223d856688ebec41",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0.json
index 58d10a3c4..eb577b8be 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_OOGMAfter_d0g0v0_EIP150" : {
+    "callcallcall_000_OOGMAfter_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/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x2abaddccd37fac30e09ddd5150a232b2af578f58176113e01c39b0b721bd518a",
-                    "mixHash" : "0x755c6bc30860a89b9dbb584e77cad478847574d46134ee1be0cd44a7f7fce847",
-                    "nonce" : "0x08c91ad9188c6973",
+                    "hash" : "0xec98d40b71a08608d407a0ae2752d5a235941e6f24cf03eda6005c53a9beffbe",
+                    "mixHash" : "0xe9dcdf040a4d2982398db84fb8ba2034dfd9d3c8c9d098df0cbf7e959f7352e3",
+                    "nonce" : "0xa332e4be942972da",
                     "number" : "0x01",
                     "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
-                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xe071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0755c6bc30860a89b9dbb584e77cad478847574d46134ee1be0cd44a7f7fce8478808c91ad9188c6973f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0e9dcdf040a4d2982398db84fb8ba2034dfd9d3c8c9d098df0cbf7e959f7352e388a332e4be942972daf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2abaddccd37fac30e09ddd5150a232b2af578f58176113e01c39b0b721bd518a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xec98d40b71a08608d407a0ae2752d5a235941e6f24cf03eda6005c53a9beffbe",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMAfter_d0g0v0_EIP158" : {
+    "callcallcall_000_OOGMAfter_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/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x23e96bbb41cba34cf2f33c060385442cc0eb79d65f484a3bbf38db10cf06801a",
-                    "mixHash" : "0x6b028261b6423745b1ef65d4c1060b2d6361e98bb494362247634fe2662d3af6",
-                    "nonce" : "0x0ed240f3260382a1",
+                    "hash" : "0xa755aff788a44fae12d5679e3ef59ccef646d8a8252e785774a245efef226054",
+                    "mixHash" : "0x2956d69a793167e2a28b2dcba8945bcbabf8bc73f0afebc1c4c38cf5c57dff92",
+                    "nonce" : "0x06282b6c04f208ff",
+                    "number" : "0x01",
+                    "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xe071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a02956d69a793167e2a28b2dcba8945bcbabf8bc73f0afebc1c4c38cf5c57dff928806282b6c04f208fff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa755aff788a44fae12d5679e3ef59ccef646d8a8252e785774a245efef226054",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x32e344571c4a9db966efb4e8dc12f11a803d7b1f7a0b43282630a7c3e851e991",
+                    "mixHash" : "0x10d865554c402291c7a7c9f8171bc1b93662e3aa5938ff0eb4724f02b3ef4331",
+                    "nonce" : "0x3ccef963e436eb7a",
                     "number" : "0x01",
                     "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
                     "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a06b028261b6423745b1ef65d4c1060b2d6361e98bb494362247634fe2662d3af6880ed240f3260382a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a010d865554c402291c7a7c9f8171bc1b93662e3aa5938ff0eb4724f02b3ef4331883ccef963e436eb7af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23e96bbb41cba34cf2f33c060385442cc0eb79d65f484a3bbf38db10cf06801a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x32e344571c4a9db966efb4e8dc12f11a803d7b1f7a0b43282630a7c3e851e991",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMAfter_d0g0v0_Frontier" : {
+    "callcallcall_000_OOGMAfter_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/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x799bf46685acefe46d5ada59aa63f74798c658206620ebde124c9f6048b4b7a5",
-                    "mixHash" : "0xc69fcbe402ba9b93a7daa7b07ee4c9d64697ee1e992ce513dbfd836cb7cf61a4",
-                    "nonce" : "0xf520e83fc72e12ad",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x1ca07e7ceee6ad31be28cb6013d789f7d954859c4b2657d0f17db761b1a83d03",
+                    "mixHash" : "0xfd0a911cfdcac0492b9dd7e88a4ded54523c833ee0fe64c40adf385a00afda3d",
+                    "nonce" : "0x317a034d933ef1e5",
                     "number" : "0x01",
                     "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
-                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
+                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
+                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c69fcbe402ba9b93a7daa7b07ee4c9d64697ee1e992ce513dbfd836cb7cf61a488f520e83fc72e12adf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0fd0a911cfdcac0492b9dd7e88a4ded54523c833ee0fe64c40adf385a00afda3d88317a034d933ef1e5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x799bf46685acefe46d5ada59aa63f74798c658206620ebde124c9f6048b4b7a5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1ca07e7ceee6ad31be28cb6013d789f7d954859c4b2657d0f17db761b1a83d03",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMAfter_d0g0v0_Homestead" : {
+    "callcallcall_000_OOGMAfter_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/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x7326985a6354ce3ca2da75a17b7187e3472f50f8c6f8bd8c6a2a5b3b2a0ecdcf",
-                    "mixHash" : "0x87c9e0be21fb5f6a220c561fd11810572e68cffacb64d3e721db4c250ad934b0",
-                    "nonce" : "0xf5ec5529bec9d518",
+                    "hash" : "0x6081243dca7c71beee54020f51d5882ae7ce24781c88f9c926dec2680a792ecd",
+                    "mixHash" : "0xa4682abec2955e388a20a977afe5d88afad7ff7a11c8be583461cbd163f5b3b7",
+                    "nonce" : "0x833108ad8ab8b06f",
                     "number" : "0x01",
                     "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
                     "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a087c9e0be21fb5f6a220c561fd11810572e68cffacb64d3e721db4c250ad934b088f5ec5529bec9d518f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0a4682abec2955e388a20a977afe5d88afad7ff7a11c8be583461cbd163f5b3b788833108ad8ab8b06ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7326985a6354ce3ca2da75a17b7187e3472f50f8c6f8bd8c6a2a5b3b2a0ecdcf",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6081243dca7c71beee54020f51d5882ae7ce24781c88f9c926dec2680a792ecd",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcallcall_000_OOGMAfter_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/stCallCodes/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x50207682b8367e6ae70850d4f15b1b1409fa3ec0b9f76b280fd2986d90f50133",
-                    "mixHash" : "0x1be9acddb08b153cb07b47174cb39c74380334e150eead6020f49e685db50372",
-                    "nonce" : "0x167194b3d3d82fea",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xfffb8704054fb6680b15cacb8f9a0ca0e2a8e436f20a7bf7979c594c0eb80bbe",
+                    "mixHash" : "0x2a1c0f0f364417795ab92a4adc185c78b7747e6581995288330b1b8e700faf22",
+                    "nonce" : "0xe1ba16e163cac5df",
                     "number" : "0x01",
                     "parentHash" : "0x6f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0xe071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1",
+                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
+                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a01be9acddb08b153cb07b47174cb39c74380334e150eead6020f49e685db5037288167194b3d3d82feaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06f5b03e6e76b782b437934d2974687cd0f417d2bc60a9497929c8f053a3f6789a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a02a1c0f0f364417795ab92a4adc185c78b7747e6581995288330b1b8e700faf2288e1ba16e163cac5dff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50207682b8367e6ae70850d4f15b1b1409fa3ec0b9f76b280fd2986d90f50133",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfffb8704054fb6680b15cacb8f9a0ca0e2a8e436f20a7bf7979c594c0eb80bbe",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0.json
index 558510db5..5e1c6dbce 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_OOGMBefore_d0g0v0_EIP150" : {
+    "callcallcall_000_OOGMBefore_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/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xc26824e6ab8a3b0f720f9658e4eed6e3b7e12e345288e8c4e5d3656393dcad92",
-                    "mixHash" : "0x86eccbd5eef0e78ee4a6ffbe3a1ca96bbe72fce30fa10c2b8e91d0f42d6f82a1",
-                    "nonce" : "0xad822ab3dde62de6",
+                    "hash" : "0x24cc6339fc9a3ab0618ce655028e0590df1388104e735a4240dddf22a5f34712",
+                    "mixHash" : "0xd6be2bb8ae961bf83c59a69922fc005b380764f3f1259ba60b7fa5b5933378b8",
+                    "nonce" : "0x1d3a137558bf9673",
                     "number" : "0x01",
                     "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "0xf926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
-                    "stateRoot" : "0xdba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3d",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x9e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a086eccbd5eef0e78ee4a6ffbe3a1ca96bbe72fce30fa10c2b8e91d0f42d6f82a188ad822ab3dde62de6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0d6be2bb8ae961bf83c59a69922fc005b380764f3f1259ba60b7fa5b5933378b8881d3a137558bf9673f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc26824e6ab8a3b0f720f9658e4eed6e3b7e12e345288e8c4e5d3656393dcad92",
-        "network" : "EIP150",
+        "lastblockhash" : "0x24cc6339fc9a3ab0618ce655028e0590df1388104e735a4240dddf22a5f34712",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMBefore_d0g0v0_EIP158" : {
+    "callcallcall_000_OOGMBefore_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/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x760c05893a42a43c7ac4d117a006e5871e508f195792100d26b8d87239ae97d0",
-                    "mixHash" : "0xa3a0e4b1592cb8bc524cb2b5d3446da3a99219a7741366fe02f4bdaaac15a49b",
-                    "nonce" : "0x49a46590192797b3",
+                    "hash" : "0xfdc333fb688b3b51aadd1c1fd81fc6bd5c4e974dec182e82e7f183b391ff1689",
+                    "mixHash" : "0x04d40f689ef141ca89538a1e9c3c90c126f7738dfac3c292603227919ad1aa48",
+                    "nonce" : "0x02747a5111653057",
+                    "number" : "0x01",
+                    "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x9e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a004d40f689ef141ca89538a1e9c3c90c126f7738dfac3c292603227919ad1aa488802747a5111653057f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfdc333fb688b3b51aadd1c1fd81fc6bd5c4e974dec182e82e7f183b391ff1689",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xa614b8e6d36fab7df268442607c008fddc96867027071306d46607e032114381",
+                    "mixHash" : "0xaa82f8f12304b2a70a806e8689125f13439fbf27525e17331639afaf89a90ced",
+                    "nonce" : "0x95d6336027f74a15",
                     "number" : "0x01",
                     "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
                     "receiptTrie" : "0xf926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0a3a0e4b1592cb8bc524cb2b5d3446da3a99219a7741366fe02f4bdaaac15a49b8849a46590192797b3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0aa82f8f12304b2a70a806e8689125f13439fbf27525e17331639afaf89a90ced8895d6336027f74a15f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x760c05893a42a43c7ac4d117a006e5871e508f195792100d26b8d87239ae97d0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa614b8e6d36fab7df268442607c008fddc96867027071306d46607e032114381",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMBefore_d0g0v0_Frontier" : {
+    "callcallcall_000_OOGMBefore_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/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x87bfa2169683e8584415dbe1e82ed0c4229968de35dd444c62060de4b6dd5f26",
-                    "mixHash" : "0x8db68b35517d2e5f540df61c99aac8fcd9952096e1fcfe15794b251b9c36c916",
-                    "nonce" : "0x5bd5e98de5ba68b2",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x7950ff41f07bc15556c0a04665db937243db70a85f115beb10a532accbd3e9c7",
+                    "mixHash" : "0x8cd2affbb17cb4f72593e12c0c058e44a1c959d92211ad37ef689b1737541b22",
+                    "nonce" : "0x0dd89d63c92e69cc",
                     "number" : "0x01",
                     "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "0xf77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
-                    "stateRoot" : "0x6eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581",
+                    "receiptTrie" : "0xf926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76",
+                    "stateRoot" : "0xdba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08db68b35517d2e5f540df61c99aac8fcd9952096e1fcfe15794b251b9c36c916885bd5e98de5ba68b2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba4d2948e42c04f2087e58d3c71d611b9c67e7eae51a00b21792b3a7c703f3da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f926f641b02d1f807e3ec0a62ea1ea1c78b0f9e08b7872519a0c7a70a731be76b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08cd2affbb17cb4f72593e12c0c058e44a1c959d92211ad37ef689b1737541b22880dd89d63c92e69ccf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87bfa2169683e8584415dbe1e82ed0c4229968de35dd444c62060de4b6dd5f26",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7950ff41f07bc15556c0a04665db937243db70a85f115beb10a532accbd3e9c7",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMBefore_d0g0v0_Homestead" : {
+    "callcallcall_000_OOGMBefore_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/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x204a36b4b59d84abf90f9e1f4d5f2fdbaa893ab0041e1bbf31065927b4e1f5ee",
-                    "mixHash" : "0x0c6c5eec8cbbca76e8edb469476adacc25fca188a86d55c4ea03d7508c9992e4",
-                    "nonce" : "0xd736437845e430a8",
+                    "hash" : "0x8edb869a2ec5451093375345ab0cb956fd16c7a6bf6348904d77d32155f06b42",
+                    "mixHash" : "0x6bca7a4a308109d5c977264c5368258b5daf39ac1bb56f82563ebc1aa045afa7",
+                    "nonce" : "0x7058645452829b66",
                     "number" : "0x01",
                     "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
                     "receiptTrie" : "0xf77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a00c6c5eec8cbbca76e8edb469476adacc25fca188a86d55c4ea03d7508c9992e488d736437845e430a8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a06bca7a4a308109d5c977264c5368258b5daf39ac1bb56f82563ebc1aa045afa7887058645452829b66f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x204a36b4b59d84abf90f9e1f4d5f2fdbaa893ab0041e1bbf31065927b4e1f5ee",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8edb869a2ec5451093375345ab0cb956fd16c7a6bf6348904d77d32155f06b42",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcallcall_000_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcallcall_000_OOGMBefore_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/stCallCodes/callcallcall_000_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0xaade1d05c585ca5156a8ee8d5cbd9ce1992275280f4c11892dab9aac2cb05fab",
-                    "mixHash" : "0xf307cdcdc074de62fa4a18c1dd3157b9526d04cb7b471ffb1060b8e9723e6fe3",
-                    "nonce" : "0x52f665f27e215167",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x2de3d5acbbfab87a593ff5a4cf379486406f7f0e7c564df2e22e2b71445099bc",
+                    "mixHash" : "0x82c96b221413894fa52a8c9c4f73b59ff32d674fd0ea9aa11c342424936e93bf",
+                    "nonce" : "0x3bd9ca1168a759bc",
                     "number" : "0x01",
                     "parentHash" : "0x6de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135f",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0x9e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfb",
+                    "receiptTrie" : "0xf77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333",
+                    "stateRoot" : "0x6eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e33a185f5ce6114948a0ceb49c046c2e2d7bece85d69501af45af9403bcfbfba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0f307cdcdc074de62fa4a18c1dd3157b9526d04cb7b471ffb1060b8e9723e6fe38852f665f27e215167f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a06de8d5f938821ff8e50053bff848f5719ae58dca5a17da4275bec54c36e3135fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eecfeed32b2e89f634a3e050fc4bfc77042295f2204fd409c8f2889e6026581a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f77ac55a5e04f3dc93c44d3e01b067374b1d2de4c4826c3c8e77aa8a70ae5333b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a082c96b221413894fa52a8c9c4f73b59ff32d674fd0ea9aa11c342424936e93bf883bd9ca1168a759bcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06613be7d3fa8f72d60927ee80a4e54dc6b50436bbfe3884f2641ea1af30d6766a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaade1d05c585ca5156a8ee8d5cbd9ce1992275280f4c11892dab9aac2cb05fab",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2de3d5acbbfab87a593ff5a4cf379486406f7f0e7c564df2e22e2b71445099bc",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0.json
index 1a4175418..ede61d1c7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_SuicideEnd_d0g0v0_EIP150" : {
+    "callcallcall_000_SuicideEnd_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/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x119fa364a669e8ea32d1a24bb2753e44195e37ab7ad15b1da7cb1b36df31b3c8",
-                    "mixHash" : "0x8ad698af1d692da461bc3cf7c8430e373e96a73ae5b8866bd09cdc7112dcfd2d",
-                    "nonce" : "0xb15d0080bd36fc0b",
+                    "hash" : "0x89777a7526811684ed882d7c5c042ef91a1a84d959db4a4c74bee37bfeeff513",
+                    "mixHash" : "0xa00309a5254e3da25564857f37ce8fd8daf0a7d6b8799dd6ee1ff121d909de90",
+                    "nonce" : "0x2f2c43260e324d10",
                     "number" : "0x01",
                     "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "0xcd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
-                    "stateRoot" : "0x1134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x9321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a08ad698af1d692da461bc3cf7c8430e373e96a73ae5b8866bd09cdc7112dcfd2d88b15d0080bd36fc0bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0a00309a5254e3da25564857f37ce8fd8daf0a7d6b8799dd6ee1ff121d909de90882f2c43260e324d10f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x119fa364a669e8ea32d1a24bb2753e44195e37ab7ad15b1da7cb1b36df31b3c8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x89777a7526811684ed882d7c5c042ef91a1a84d959db4a4c74bee37bfeeff513",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -142,10 +149,160 @@
             }
         }
     },
-    "callcallcall_000_SuicideEnd_d0g0v0_EIP158" : {
+    "callcallcall_000_SuicideEnd_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x89fd5725c9473a6e94d61931bf519619c63c9afb180774dfca0e9d6eb471d364",
+                    "mixHash" : "0xf6b9fe67c34adec6855f8c6e1aa6f9d4a0bfc3c913c9ab29d5305dea6a7df5af",
+                    "nonce" : "0xc44c3ceef3c487a3",
+                    "number" : "0x01",
+                    "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x9321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0f6b9fe67c34adec6855f8c6e1aa6f9d4a0bfc3c913c9ab29d5305dea6a7df5af88c44c3ceef3c487a3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x89fd5725c9473a6e94d61931bf519619c63c9afb180774dfca0e9d6eb471d364",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x04a817c800",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_SuicideEnd_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/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -157,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xff6ba0a7c899c909e4c9094085e883e92dd47c5d2061d3a345fa048db9573bef",
-                    "mixHash" : "0x885cc505c54121d9311d8141de3d34af5d9c08ccf3cfaae512a85325d1bb8c91",
-                    "nonce" : "0x78aff911afbea4a4",
+                    "hash" : "0xb3ad9b483205cc83c4a0150412012ecf7388417f48f3a8b89aa952c3d96a2aad",
+                    "mixHash" : "0x79e940c6a48c9a00bf79f24dec525aa58907c884898337a13538c2f29b5a8dcc",
+                    "nonce" : "0xbb1a188fc64a1d2a",
                     "number" : "0x01",
                     "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
                     "receiptTrie" : "0xcd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
@@ -168,7 +325,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0885cc505c54121d9311d8141de3d34af5d9c08ccf3cfaae512a85325d1bb8c918878aff911afbea4a4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a079e940c6a48c9a00bf79f24dec525aa58907c884898337a13538c2f29b5a8dcc88bb1a188fc64a1d2af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -205,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff6ba0a7c899c909e4c9094085e883e92dd47c5d2061d3a345fa048db9573bef",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb3ad9b483205cc83c4a0150412012ecf7388417f48f3a8b89aa952c3d96a2aad",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -285,10 +442,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideEnd_d0g0v0_Frontier" : {
+    "callcallcall_000_SuicideEnd_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/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -299,19 +456,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0x90c646a480d0235d6a9b844971687ff29c0738e03f3548d1720254ae54ec7f6b",
-                    "mixHash" : "0xaa072951d817116b947e10c1b690cc08d25a4cddaca514a047d154c901c36df0",
-                    "nonce" : "0x8fd8e42e5843061e",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x0bdf657bb506cbb7ce4c9c8c1d846736319bf00a12b7993aad31e8723ec6c4d6",
+                    "mixHash" : "0xca287a8577dd8f96bc0961184354781a66931d6a7a8bd72fdd1974cea7b8c038",
+                    "nonce" : "0xf0976e0c2c408caa",
                     "number" : "0x01",
                     "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "0xeaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
-                    "stateRoot" : "0x2c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33",
+                    "receiptTrie" : "0xcd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680",
+                    "stateRoot" : "0x1134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0aa072951d817116b947e10c1b690cc08d25a4cddaca514a047d154c901c36df0888fd8e42e5843061ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01134a99c62efda8c96332bfca9fafea604eae83eb23198df011b88273d8fd243a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cd52bac8a9fc858b68eec1336bd32112885c98528d0252a77ca91f780ffc5680b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0ca287a8577dd8f96bc0961184354781a66931d6a7a8bd72fdd1974cea7b8c03888f0976e0c2c408caaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -348,8 +505,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90c646a480d0235d6a9b844971687ff29c0738e03f3548d1720254ae54ec7f6b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0bdf657bb506cbb7ce4c9c8c1d846736319bf00a12b7993aad31e8723ec6c4d6",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -376,14 +533,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -428,10 +585,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideEnd_d0g0v0_Homestead" : {
+    "callcallcall_000_SuicideEnd_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/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -443,9 +600,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0x1952fdd4778781b3569bf5dc96e882b29a490542aff1af493068503e0d92f18b",
-                    "mixHash" : "0x3ea8ac580f894dff34b2d61fc6cf81ec04622f89c0694f786f8c0784f2b89beb",
-                    "nonce" : "0x9632b14868d72445",
+                    "hash" : "0x3d172685db69db61700bbe9f426f7b66a1b15db79626e6ea5f63082558c2daac",
+                    "mixHash" : "0x1bbd7f5ec458c64846d5225fa8951b0aab95ea386111c8c1cb9363eb4c045ff6",
+                    "nonce" : "0xcd286f887fd7883b",
                     "number" : "0x01",
                     "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
                     "receiptTrie" : "0xeaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
@@ -454,7 +611,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a03ea8ac580f894dff34b2d61fc6cf81ec04622f89c0694f786f8c0784f2b89beb889632b14868d72445f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a01bbd7f5ec458c64846d5225fa8951b0aab95ea386111c8c1cb9363eb4c045ff688cd286f887fd7883bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -491,8 +648,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1952fdd4778781b3569bf5dc96e882b29a490542aff1af493068503e0d92f18b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3d172685db69db61700bbe9f426f7b66a1b15db79626e6ea5f63082558c2daac",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -571,10 +728,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcallcall_000_SuicideEnd_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/stCallCodes/callcallcall_000_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,19 +742,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x34341b355378b5a27cf2794a7d0e8cc5fe6f6cba92665012e49faa13e27486cb",
-                    "mixHash" : "0x24e781d30dc6fce59e4410053a108732247eba794cbd8d02d3a1703e2a892d12",
-                    "nonce" : "0xbdaab6418d6dfba8",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0x572eeb59298e834f545cf06df020a9ccf0f6f41ebbee7cafa6d2e20d79d197d1",
+                    "mixHash" : "0xeeaf7a88e27d11fe9eb47a908ac507f4e901adbf69808fe267fb8d4ab1466667",
+                    "nonce" : "0x7f8ab0173100e87e",
                     "number" : "0x01",
                     "parentHash" : "0x93ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0x9321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47",
+                    "receiptTrie" : "0xeaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4",
+                    "stateRoot" : "0x2c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09321b361854dfe165013203fe641b4aeb8553d01790b2e7e0184cf228fabbd47a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a024e781d30dc6fce59e4410053a108732247eba794cbd8d02d3a1703e2a892d1288bdaab6418d6dfba8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a093ad0c1f5a750086a1421bcc7b3332f5ce18e0e37899a327b3b96dd5728397f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c6c58194b07a322e877ec4c1564f74564026a37cf50eaeb129f651593ec0b33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa27ca43d14ac3649aae67143dcdec93fcae0bc0221d99ca917940f6f1edfb4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0eeaf7a88e27d11fe9eb47a908ac507f4e901adbf69808fe267fb8d4ab1466667887f8ab0173100e87ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -634,16 +791,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd67e97a692bc425c06dc46052608c66cf514da358bb560d37573da9568f1b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34341b355378b5a27cf2794a7d0e8cc5fe6f6cba92665012e49faa13e27486cb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x572eeb59298e834f545cf06df020a9ccf0f6f41ebbee7cafa6d2e20d79d197d1",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -669,14 +819,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
index 1f72401a1..58028d18c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcallcall_000_SuicideMiddle_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/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x4b549d21b4d37fe023a6e14b2cc4939d4dbd11a01679fbf27fdd3b079f54782e",
-                    "mixHash" : "0x397f8396499b6a569d221518a866c2b6e8768b46bace290953e018d91d05df8c",
-                    "nonce" : "0x6ce4ed4ae38336b5",
+                    "hash" : "0x49e005df9efc65e54970095d6fc7cbd9edc7d6c356c24054b5d3f05036af71ae",
+                    "mixHash" : "0x3db29a3d6763973d84a3302db8e0b6e68710faafa59f7f4097ca1d01e43e082a",
+                    "nonce" : "0xeddc9b4c0d4c540f",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0397f8396499b6a569d221518a866c2b6e8768b46bace290953e018d91d05df8c886ce4ed4ae38336b5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03db29a3d6763973d84a3302db8e0b6e68710faafa59f7f4097ca1d01e43e082a88eddc9b4c0d4c540ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b549d21b4d37fe023a6e14b2cc4939d4dbd11a01679fbf27fdd3b079f54782e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x49e005df9efc65e54970095d6fc7cbd9edc7d6c356c24054b5d3f05036af71ae",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcallcall_000_SuicideMiddle_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/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xe783a8262d9d6fddb93ae9d7015edea03375775a24aa91c1489e40111f107e02",
-                    "mixHash" : "0x54883517de8ddf55391c51d950eb996005dcbb3d22e99a1f978a0279dafe5ff8",
-                    "nonce" : "0xdb3e407dbb8bba46",
+                    "hash" : "0x5ecaf392a7d407e9406a56c4855cbfd960a8f76906e938cc719da754eb6f5e72",
+                    "mixHash" : "0xb30889f58bfc7571e9ac04161e305d0fcade36e579cf4b2ddb5e35539b6982c3",
+                    "nonce" : "0x82aea9bc7d069fd0",
+                    "number" : "0x01",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0b30889f58bfc7571e9ac04161e305d0fcade36e579cf4b2ddb5e35539b6982c38882aea9bc7d069fd0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5ecaf392a7d407e9406a56c4855cbfd960a8f76906e938cc719da754eb6f5e72",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x5f00ddf898f356d533afb3409185dd8573965462d3cd17e8d03a722ef877844f",
+                    "mixHash" : "0xf8ce7c345527237e7cd42c9dd662dad39ef78926b4ed972ddd18508740cb22ce",
+                    "nonce" : "0x52a669e803119182",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
                     "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a054883517de8ddf55391c51d950eb996005dcbb3d22e99a1f978a0279dafe5ff888db3e407dbb8bba46f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f8ce7c345527237e7cd42c9dd662dad39ef78926b4ed972ddd18508740cb22ce8852a669e803119182f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe783a8262d9d6fddb93ae9d7015edea03375775a24aa91c1489e40111f107e02",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5f00ddf898f356d533afb3409185dd8573965462d3cd17e8d03a722ef877844f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcallcall_000_SuicideMiddle_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/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0x4cd6fe89887bdd31d5ae9db3c3e57f76b0398c4cebdcfb721fa3c8d009f37fcc",
-                    "mixHash" : "0xd65be070398a098795de65626f9bac77593938ae65e780ce4353e522990fa4d3",
-                    "nonce" : "0xbcd2e7cac493a1a5",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x926e312594c6634ed8329a8726b80c868f8144e8c4c0899467292b0199b46d61",
+                    "mixHash" : "0x3ce8bd6f13ceb71abc41a002211bdc195ae95d7d78ccb3213d0aee83774e58f6",
+                    "nonce" : "0x7bebc47c1842528e",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0d65be070398a098795de65626f9bac77593938ae65e780ce4353e522990fa4d388bcd2e7cac493a1a5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03ce8bd6f13ceb71abc41a002211bdc195ae95d7d78ccb3213d0aee83774e58f6887bebc47c1842528ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cd6fe89887bdd31d5ae9db3c3e57f76b0398c4cebdcfb721fa3c8d009f37fcc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x926e312594c6634ed8329a8726b80c868f8144e8c4c0899467292b0199b46d61",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcallcall_000_SuicideMiddle_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/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0xb04c14d2878ca6ed8624266931c0684f3c77ad7d61a55e681ebfa89f728d9d3e",
-                    "mixHash" : "0xc843eef90011a5fe4d2929c17fe9c7faf3607a8bcdff26c28d7623c30359c0d9",
-                    "nonce" : "0xcd9465ad8e8dade0",
+                    "hash" : "0x634fdeac47d2d68d0fd09cd666310fdaf160b4c00e03eab3ec9a89c6d470ec84",
+                    "mixHash" : "0xff261b1117349a2196d4f55f93953db058ccb4bfd298217e4239f116f78c2f40",
+                    "nonce" : "0xdcd40f82b7b63f13",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
                     "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c843eef90011a5fe4d2929c17fe9c7faf3607a8bcdff26c28d7623c30359c0d988cd9465ad8e8dade0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0ff261b1117349a2196d4f55f93953db058ccb4bfd298217e4239f116f78c2f4088dcd40f82b7b63f13f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb04c14d2878ca6ed8624266931c0684f3c77ad7d61a55e681ebfa89f728d9d3e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x634fdeac47d2d68d0fd09cd666310fdaf160b4c00e03eab3ec9a89c6d470ec84",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcallcall_000_SuicideMiddle_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/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x170d1899c9f863e54bbf090a4a9f3218fd0b8f0e54f0e586cdd142133c5668b8",
-                    "mixHash" : "0xaae4ba1f6ca65bb6b5e2ba9acfe964a97acc33a4dac8d506756a1ea98eb58c41",
-                    "nonce" : "0x94495c5fbe33b747",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x398d57d41d7e354d20e0cf5290a9ccc2f2f4fe758994295a784f6d8fe2ae5fde",
+                    "mixHash" : "0xda651b2497df9d3938b5b41d4f826f6b13be616278443eea0fb9b1af94da0e50",
+                    "nonce" : "0x7c2c773568ce15ce",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0aae4ba1f6ca65bb6b5e2ba9acfe964a97acc33a4dac8d506756a1ea98eb58c418894495c5fbe33b747f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0da651b2497df9d3938b5b41d4f826f6b13be616278443eea0fb9b1af94da0e50887c2c773568ce15cef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x170d1899c9f863e54bbf090a4a9f3218fd0b8f0e54f0e586cdd142133c5668b8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x398d57d41d7e354d20e0cf5290a9ccc2f2f4fe758994295a784f6d8fe2ae5fde",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_d0g0v0.json
index cd18c9919..0d1c45672 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_d0g0v0_EIP150" : {
+    "callcallcall_000_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/stCallCodes/callcallcall_000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xf68b8f2d68c36804c8fc9ac14af8619e78e99c9331efcfbbfbe560f40c7eb130",
-                    "mixHash" : "0x34a07310c20fbdd28c69a10c40aa90b647b172ad6b1eff28278f2a58739c2c02",
-                    "nonce" : "0x1500b4f9258148aa",
+                    "hash" : "0x26b67765f964191d9fa8800788bcbdccf5c4688cfba052f5c8fd47dfd23fb2eb",
+                    "mixHash" : "0xbaaf5d5541bead32bf1795caab1fa7e9a347c6f7fd750f0de6080e89c6e2202d",
+                    "nonce" : "0x6dae419c4ef6720b",
                     "number" : "0x01",
                     "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "0xe51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
-                    "stateRoot" : "0xcea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5f",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xfa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a034a07310c20fbdd28c69a10c40aa90b647b172ad6b1eff28278f2a58739c2c02881500b4f9258148aaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0baaf5d5541bead32bf1795caab1fa7e9a347c6f7fd750f0de6080e89c6e2202d886dae419c4ef6720bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf68b8f2d68c36804c8fc9ac14af8619e78e99c9331efcfbbfbe560f40c7eb130",
-        "network" : "EIP150",
+        "lastblockhash" : "0x26b67765f964191d9fa8800788bcbdccf5c4688cfba052f5c8fd47dfd23fb2eb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcallcall_000_d0g0v0_EIP158" : {
+    "callcallcall_000_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/stCallCodes/callcallcall_000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x58de1bf259261d32b3a2fd1ae7df6e1a83f6812e8ff8c4f5788317f0cd110a2b",
-                    "mixHash" : "0x89143e355c0cd285b802d3effbe6d595d5fc8753f448272a636d80cd8e396d06",
-                    "nonce" : "0xa6ace59c038646e8",
+                    "hash" : "0x1bf1abdbd2641571965867ce9c256f70d509fc7c36a413d84bc76633b64670ca",
+                    "mixHash" : "0xd569bc3c6e3089e54d42292d54a8926caed5df69a9f8f68dfd1d164fb8303dca",
+                    "nonce" : "0xefaadbd11ba78011",
+                    "number" : "0x01",
+                    "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xfa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0d569bc3c6e3089e54d42292d54a8926caed5df69a9f8f68dfd1d164fb8303dca88efaadbd11ba78011f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1bf1abdbd2641571965867ce9c256f70d509fc7c36a413d84bc76633b64670ca",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x03",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x014a" : "0x1000000000000000000000000000000000000003",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000002",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xcae7edeff8870358866d2a588b80098cc71407fa15a9e67b02bb0fe12d8bbf21",
+                    "mixHash" : "0x5efdf2405c478e172ec8b33dfd0599a40994bcff2ed42d7d3e7cd175af63b995",
+                    "nonce" : "0xa6e985aa70d98a14",
                     "number" : "0x01",
                     "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
                     "receiptTrie" : "0xe51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a089143e355c0cd285b802d3effbe6d595d5fc8753f448272a636d80cd8e396d0688a6ace59c038646e8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a05efdf2405c478e172ec8b33dfd0599a40994bcff2ed42d7d3e7cd175af63b99588a6e985aa70d98a14f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58de1bf259261d32b3a2fd1ae7df6e1a83f6812e8ff8c4f5788317f0cd110a2b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcae7edeff8870358866d2a588b80098cc71407fa15a9e67b02bb0fe12d8bbf21",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcallcall_000_d0g0v0_Frontier" : {
+    "callcallcall_000_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/stCallCodes/callcallcall_000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0x28cda8041ff735029086144122759195c4261cd430eea9181a6549350da56cbf",
-                    "mixHash" : "0xf0502ccfddd6da3b45d848107c4c12fe55255a2147d86ac0b787e042984da4bb",
-                    "nonce" : "0x229fb6b2f6cb8a0f",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x72d91b9e6cb89b07a6728a547b7dcc54ee4163bb7b98b5c0af0dfd7b35f81f30",
+                    "mixHash" : "0xef09c39e3868390aaf7111f3e0dbf7e1115ae02d761a5273c431a35a7a1f194d",
+                    "nonce" : "0xa4c1c160c275a807",
                     "number" : "0x01",
                     "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "0xa8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
-                    "stateRoot" : "0x4288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0",
+                    "receiptTrie" : "0xe51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79b",
+                    "stateRoot" : "0xcea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0f0502ccfddd6da3b45d848107c4c12fe55255a2147d86ac0b787e042984da4bb88229fb6b2f6cb8a0ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cea94434f25b201a9daf55ffd5f2baab551a1574a56ce8595e72c0db866a8d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51972c1167e0d27bb1242ddc7e09c6f87ab4a84e9edc5431d4e8f55c6baf79bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0ef09c39e3868390aaf7111f3e0dbf7e1115ae02d761a5273c431a35a7a1f194d88a4c1c160c275a807f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28cda8041ff735029086144122759195c4261cd430eea9181a6549350da56cbf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x72d91b9e6cb89b07a6728a547b7dcc54ee4163bb7b98b5c0af0dfd7b35f81f30",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcallcall_000_d0g0v0_Homestead" : {
+    "callcallcall_000_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/stCallCodes/callcallcall_000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0x7092824abdce085218a73a46720dddb922e12008959febc477a1ca55f1750a91",
-                    "mixHash" : "0x67321dcf3f9c82f8ed2d81dfd92e701f26c029cba8cbe545359d1c3481e1279f",
-                    "nonce" : "0x316387c592a16c00",
+                    "hash" : "0x29682ecd8d99b904aa335ab4bb5891b71ce138fbaf619d8304b0657e540f28fb",
+                    "mixHash" : "0x6b00859430a079ce7a273da21d9338fb01dd838f599cb569d437159c29a99b24",
+                    "nonce" : "0x9729e9a0504e2834",
                     "number" : "0x01",
                     "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
                     "receiptTrie" : "0xa8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a067321dcf3f9c82f8ed2d81dfd92e701f26c029cba8cbe545359d1c3481e1279f88316387c592a16c00f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a06b00859430a079ce7a273da21d9338fb01dd838f599cb569d437159c29a99b24889729e9a0504e2834f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7092824abdce085218a73a46720dddb922e12008959febc477a1ca55f1750a91",
-        "network" : "Homestead",
+        "lastblockhash" : "0x29682ecd8d99b904aa335ab4bb5891b71ce138fbaf619d8304b0657e540f28fb",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcallcall_000_d0g0v0_Metropolis" : {
+    "callcallcall_000_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/stCallCodes/callcallcall_000_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0xc677b486eeb46fccc01aa532dade915840154920a5e8b0c8c0d5f0557c9f3996",
-                    "mixHash" : "0x9cc9cfefb9a33752824a4685bb755218e0793406e4e86dcfeca1806e50e64bad",
-                    "nonce" : "0xd721a3fbd2e6f472",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0xe5c7c7f26445c6abb297e8d97b228270e86365fd6c9cc777673cba6df3858cc6",
+                    "mixHash" : "0xe1b8b07d794e4543515b0e57feec6ef770b21e699fc7c02326dd93f2f528ae2f",
+                    "nonce" : "0xb6ea2b6fce802ff5",
                     "number" : "0x01",
                     "parentHash" : "0x2184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0xfa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2b",
+                    "receiptTrie" : "0xa8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23",
+                    "stateRoot" : "0x4288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa5415d78e87c23a7a2a4e9cb43fa80471dd3233105f4d4398317508dc47db2ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a09cc9cfefb9a33752824a4685bb755218e0793406e4e86dcfeca1806e50e64bad88d721a3fbd2e6f472f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02184b0ffa36629d5fc6c28fc4932b5484e7d60ead0eabcc2cc64f263e3f20b72a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04288b168527250f90ba63c91f508fe84b7e247afec6759fb5cc9db72fe9feac0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a8b92d2f23cd0872f21a706f81d77b3fc0e5a65f2be79333ac07604bc54c7d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0e1b8b07d794e4543515b0e57feec6ef770b21e699fc7c02326dd93f2f528ae2f88b6ea2b6fce802ff5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08df8bcff120c061e9ec1e0c494f9ab50ab73deec77568c5ebf41823ce5a8c399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc677b486eeb46fccc01aa532dade915840154920a5e8b0c8c0d5f0557c9f3996",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe5c7c7f26445c6abb297e8d97b228270e86365fd6c9cc777673cba6df3858cc6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0.json
index 699646a2b..a05f09359 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcallcall_ABCB_RECURSIVE_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/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xffb11d4ed5b47b70cf68fc36c32867ece46932a7619cc803147d40c0e8f7c743",
-                    "mixHash" : "0x6098a4418adae24dabb383f80739ce8b9aeaefea1c54160edc2c3c01fbb721fd",
-                    "nonce" : "0x3d89e50c6de272d2",
+                    "hash" : "0x152d93d255d3d968eab5c2e90f339fbc49e26c988de8d85eb47d6876a02d4454",
+                    "mixHash" : "0x3f19dc60e8fa323c8b06a73d79eb079523ede7f0f2c2ea197226c2255cad5a6a",
+                    "nonce" : "0xbd5816c5c3c12b65",
                     "number" : "0x01",
                     "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "0x77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
-                    "stateRoot" : "0xc2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xd4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06098a4418adae24dabb383f80739ce8b9aeaefea1c54160edc2c3c01fbb721fd883d89e50c6de272d2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a03f19dc60e8fa323c8b06a73d79eb079523ede7f0f2c2ea197226c2255cad5a6a88bd5816c5c3c12b65f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffb11d4ed5b47b70cf68fc36c32867ece46932a7619cc803147d40c0e8f7c743",
-        "network" : "EIP150",
+        "lastblockhash" : "0x152d93d255d3d968eab5c2e90f339fbc49e26c988de8d85eb47d6876a02d4454",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcallcall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcallcall_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0xcf62c329d19e6c910cf95595b47e62a9f21eab72e91f1856f282e93095fbc85a",
+                    "mixHash" : "0xbbdcf35cbaf8e8f49153dadfeefa1bfbb633e2a536e7b60f346d195aa74d9c61",
+                    "nonce" : "0x7e30789879669763",
+                    "number" : "0x01",
+                    "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xd4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0bbdcf35cbaf8e8f49153dadfeefa1bfbb633e2a536e7b60f346d195aa74d9c61887e30789879669763f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xedf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcf62c329d19e6c910cf95595b47e62a9f21eab72e91f1856f282e93095fbc85a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_ABCB_RECURSIVE_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/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xace3100f2d30375c8bc44b6b3c05c82183a288f6de62836bfe09e70bcb835d24",
-                    "mixHash" : "0xf0156c43e28170684f66f4e89caf738cd2298c4a0a305594d832279a199da3fd",
-                    "nonce" : "0x4ea2976fb0eb4c56",
+                    "hash" : "0x2aa1aa760162e7f6f71cad5e32c4065991aeebf274769c432c7aadb2b1d3694b",
+                    "mixHash" : "0xa9e70deaeed428a56c7b0e52f66798ab112929e1b1f313227f6b4578f8da97a7",
+                    "nonce" : "0x315fd50b92e69b54",
                     "number" : "0x01",
                     "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
                     "receiptTrie" : "0x77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0f0156c43e28170684f66f4e89caf738cd2298c4a0a305594d832279a199da3fd884ea2976fb0eb4c56f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0a9e70deaeed428a56c7b0e52f66798ab112929e1b1f313227f6b4578f8da97a788315fd50b92e69b54f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xace3100f2d30375c8bc44b6b3c05c82183a288f6de62836bfe09e70bcb835d24",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2aa1aa760162e7f6f71cad5e32c4065991aeebf274769c432c7aadb2b1d3694b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcallcall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcallcall_ABCB_RECURSIVE_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/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0xd14db6a5ece5c2db407da8f885ca8688c61ce42ce27415b8942810e6ac7be8ba",
-                    "mixHash" : "0xd762400fa2c3c36e2a5aecc079dcb4615f516a2619ddaa18ff254930ed7a5dd2",
-                    "nonce" : "0x25cecd03eabc7a57",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x71155444128cc7f8d84c536ce74ed925bdc7cff8b7b4c672d298ea2cae6fda90",
+                    "mixHash" : "0xb5e5eb553fef370abff2ea4d9b6ddd5e7ce0214aadb4398d14ba0ad2df88ead4",
+                    "nonce" : "0xcb75d59bbf6bd37d",
                     "number" : "0x01",
                     "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "0x0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
-                    "stateRoot" : "0x2b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522c",
+                    "receiptTrie" : "0x77d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7",
+                    "stateRoot" : "0xc2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d762400fa2c3c36e2a5aecc079dcb4615f516a2619ddaa18ff254930ed7a5dd28825cecd03eabc7a57f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2e1bd714c8f50d270d431421c1fe138488370d6749fa8747bd71aaea0367c14a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077d7ee7fd35519e7c25f66243a97e6e9e8613f8271791f110c9b075c551fe9e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0b5e5eb553fef370abff2ea4d9b6ddd5e7ce0214aadb4398d14ba0ad2df88ead488cb75d59bbf6bd37df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd14db6a5ece5c2db407da8f885ca8688c61ce42ce27415b8942810e6ac7be8ba",
-        "network" : "Frontier",
+        "lastblockhash" : "0x71155444128cc7f8d84c536ce74ed925bdc7cff8b7b4c672d298ea2cae6fda90",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcallcall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcallcall_ABCB_RECURSIVE_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/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x1150230a86a3be47d741ee1284b5a04af0a86c612427cc54a08de054c220606d",
-                    "mixHash" : "0xd9a7c13e4f9dbf0e826396abcec7a44259b46f018037b5396018fe2bd0155115",
-                    "nonce" : "0x36df7e37f446ed05",
+                    "hash" : "0xc376b969a563901ce50fe41f2838177e82aae4f7f74c018a1dbd889996b29043",
+                    "mixHash" : "0x02e354168a68d417633bc8e222c0c8de41dbc57621c2394f031fec66a5c007db",
+                    "nonce" : "0xe445518cc028929a",
                     "number" : "0x01",
                     "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
                     "receiptTrie" : "0x0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d9a7c13e4f9dbf0e826396abcec7a44259b46f018037b5396018fe2bd01551158836df7e37f446ed05f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a002e354168a68d417633bc8e222c0c8de41dbc57621c2394f031fec66a5c007db88e445518cc028929af863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1150230a86a3be47d741ee1284b5a04af0a86c612427cc54a08de054c220606d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc376b969a563901ce50fe41f2838177e82aae4f7f74c018a1dbd889996b29043",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcallcall_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcallcall_ABCB_RECURSIVE_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/stCallCodes/callcallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0x294aa7db8fe2edcebed104aaf2e99e73aa55cc861100e791728a90104d01d6cc",
-                    "mixHash" : "0x91ce6f922314aa624f21bf582d15e83681a94a5d6f01d550315db98e0048a3de",
-                    "nonce" : "0x02d88e1bdfbef0f8",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0x556fe50992015507d46df6173b87eff7b712448112af64aa88f189f5eb93d58e",
+                    "mixHash" : "0x99c6137a6c3c68f1e1d3bb537a3934c59520c7212d181ad654a866fa0f59ef48",
+                    "nonce" : "0x3fb09516fb3ab36e",
                     "number" : "0x01",
                     "parentHash" : "0x6b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0xd4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91",
+                    "receiptTrie" : "0x0a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012f",
+                    "stateRoot" : "0x2b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4ae1cb190ed174df265bdd6cc9e5491f0c9818fdae917fc03c42a951daf6d91a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a091ce6f922314aa624f21bf582d15e83681a94a5d6f01d550315db98e0048a3de8802d88e1bdfbef0f8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a06b8a272c8fb0308d84e62e7e8b6a8aaeb5a29c195d9f24f9c5135500d73662d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6ff613230b0c9f185281a8abccad47488a65396c843438749baf333367522ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a00a0793dccd436aa9e06afb50e258682ce942511ce28966759dca70a9ec0c012fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a099c6137a6c3c68f1e1d3bb537a3934c59520c7212d181ad654a866fa0f59ef48883fb09516fb3ab36ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf64ec7abb644cf31477ad9e16752a84d360b04425eb34b100a333d88e7a335a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x294aa7db8fe2edcebed104aaf2e99e73aa55cc861100e791728a90104d01d6cc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x556fe50992015507d46df6173b87eff7b712448112af64aa88f189f5eb93d58e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE_d0g0v0.json
index 97aa9d439..ba6c36c17 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_001_OOGE_d0g0v0_EIP150" : {
+    "callcallcallcode_001_OOGE_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/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x96d6a953a6a1834528142d3ef7549815d2e712d403b41babd66a0053a1fe0858",
-                    "mixHash" : "0x5f53d12fa250164e54c134560ad70d583913963ba98380aca01c9c71d93013ca",
-                    "nonce" : "0x641888ff1fdb20a2",
+                    "hash" : "0x8eac0d7c9eee2af182af80b981a2a4775b4114193ea346d1055c307c314b93ca",
+                    "mixHash" : "0x9f88e1ae85fe1dd25d3cc541db79c6bd3211df61c1c9fcad5828de28d623b0e2",
+                    "nonce" : "0x2587a058570a0588",
                     "number" : "0x01",
                     "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "0x2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
-                    "stateRoot" : "0x9c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x7671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05f53d12fa250164e54c134560ad70d583913963ba98380aca01c9c71d93013ca88641888ff1fdb20a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a09f88e1ae85fe1dd25d3cc541db79c6bd3211df61c1c9fcad5828de28d623b0e2882587a058570a0588f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x96d6a953a6a1834528142d3ef7549815d2e712d403b41babd66a0053a1fe0858",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8eac0d7c9eee2af182af80b981a2a4775b4114193ea346d1055c307c314b93ca",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcallcallcode_001_OOGE_d0g0v0_EIP158" : {
+    "callcallcallcode_001_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x487f6acd7c9e0f3b354a3eea9a30d76d27b91cc81fc1f4f1c6d7dda0ec1427a4",
+                    "mixHash" : "0x673c103974a57611d575ddec35f022c8f664bfb6138210baac4b057bdc50c05b",
+                    "nonce" : "0x37bb734b61afb03b",
+                    "number" : "0x01",
+                    "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x7671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0673c103974a57611d575ddec35f022c8f664bfb6138210baac4b057bdc50c05b8837bb734b61afb03bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x487f6acd7c9e0f3b354a3eea9a30d76d27b91cc81fc1f4f1c6d7dda0ec1427a4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_OOGE_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/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x8b8ee9364fd1acaed9244b32b731e902a6e3d6dd706b53df35aaa29a76478676",
-                    "mixHash" : "0xa1eb2aecfa0bfe8b3f0dde661aad5ee5e7d7ae1dacbc0f695c6b628751451347",
-                    "nonce" : "0x6a0bc238df3755f6",
+                    "hash" : "0x5115225d286c7537f5d7ae9408c6e8d0048cd5ba82c332bc995e43b6fd298c87",
+                    "mixHash" : "0x5b7019d1e0c2ad1ab184bff863b9272e4491ef9366a237a75a5591f6e321f47e",
+                    "nonce" : "0x933130361fe9ef2b",
                     "number" : "0x01",
                     "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
                     "receiptTrie" : "0x2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a1eb2aecfa0bfe8b3f0dde661aad5ee5e7d7ae1dacbc0f695c6b628751451347886a0bc238df3755f6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05b7019d1e0c2ad1ab184bff863b9272e4491ef9366a237a75a5591f6e321f47e88933130361fe9ef2bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b8ee9364fd1acaed9244b32b731e902a6e3d6dd706b53df35aaa29a76478676",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5115225d286c7537f5d7ae9408c6e8d0048cd5ba82c332bc995e43b6fd298c87",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGE_d0g0v0_Frontier" : {
+    "callcallcallcode_001_OOGE_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/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0x58836fead519701a317a5860385609c7a481b94ef33d7e5dace26b8b72a924af",
-                    "mixHash" : "0x96125aa2e47b52678649c31dc10a47f7582fa09c4e4f6974c5606a04a7ddcf8b",
-                    "nonce" : "0x89122157f380784e",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x23a61c8ac32d112d4d4f47baac5a5e7717e8d720386b0862f90abf61ecb554e4",
+                    "mixHash" : "0xd2aefdde3fdd116444f65dc7e27b0d51ddf5445230dd28b6275311105af9a084",
+                    "nonce" : "0x1f9612a2a3a49528",
                     "number" : "0x01",
                     "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "0x952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
-                    "stateRoot" : "0x5b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11",
+                    "receiptTrie" : "0x2d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4b",
+                    "stateRoot" : "0x9c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a096125aa2e47b52678649c31dc10a47f7582fa09c4e4f6974c5606a04a7ddcf8b8889122157f380784ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c2ee8ba72f651fb259911d99f03279b176123820eb6df36b2c6d5e03a44b315a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d4d9c33287775c0a02b1993e4c3f959d11a66f643674de63b2f0162ffdb0d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0d2aefdde3fdd116444f65dc7e27b0d51ddf5445230dd28b6275311105af9a084881f9612a2a3a49528f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58836fead519701a317a5860385609c7a481b94ef33d7e5dace26b8b72a924af",
-        "network" : "Frontier",
+        "lastblockhash" : "0x23a61c8ac32d112d4d4f47baac5a5e7717e8d720386b0862f90abf61ecb554e4",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGE_d0g0v0_Homestead" : {
+    "callcallcallcode_001_OOGE_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/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0xeb5ad4321377a86afe00cfeab324b2dc7fb68d6f72c0df3e721428dc22310c09",
-                    "mixHash" : "0xaa8081320c00dd99b5d4cecc50379579af689afe928bbde271410973f112fa69",
-                    "nonce" : "0xe8fe35721ee87ddb",
+                    "hash" : "0xef32fb820bef0395de0f591a3e4c2312a97b10db9cac8c075f04bd590b5ad81c",
+                    "mixHash" : "0x9c0f0353b875074419da7229aa61eb8f437a2d9bca92edf3e37df43256c541a7",
+                    "nonce" : "0x3db25d0255acecbc",
                     "number" : "0x01",
                     "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
                     "receiptTrie" : "0x952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0aa8081320c00dd99b5d4cecc50379579af689afe928bbde271410973f112fa6988e8fe35721ee87ddbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a09c0f0353b875074419da7229aa61eb8f437a2d9bca92edf3e37df43256c541a7883db25d0255acecbcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb5ad4321377a86afe00cfeab324b2dc7fb68d6f72c0df3e721428dc22310c09",
-        "network" : "Homestead",
+        "lastblockhash" : "0xef32fb820bef0395de0f591a3e4c2312a97b10db9cac8c075f04bd590b5ad81c",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGE_d0g0v0_Metropolis" : {
+    "callcallcallcode_001_OOGE_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/stCallCodes/callcallcallcode_001_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0xbc605a09d17b5df8495f1a3f84ca817e914199c4d7b52010e30427903c21bd20",
-                    "mixHash" : "0xb9f30cbc28c701a6e49bbd7c24b1e041b08f6827059b1ed1338622499f6c797d",
-                    "nonce" : "0x381fd7049c4a3f78",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0xedc8e758aedba9ba8a2c71304c08c9ec2a7631ead4549ad6096d09ea5d456577",
+                    "mixHash" : "0x7e534fc870e517ff7a1920018b19adb1724082a93d615934b6fa69f67683f313",
+                    "nonce" : "0x575213010c5ae0d0",
                     "number" : "0x01",
                     "parentHash" : "0x288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0x7671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66",
+                    "receiptTrie" : "0x952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089",
+                    "stateRoot" : "0x5b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07671203d02b3c9648089818d892454a26557c853f022a368aefd505d24e77e66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0b9f30cbc28c701a6e49bbd7c24b1e041b08f6827059b1ed1338622499f6c797d88381fd7049c4a3f78f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0288183df317aafdb26ce1efa0188fa2c39f454854ba468edaaf56129f90e4349a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b146f6f104eb52fa6c874b020576cfeef795e770e28779d41284565fa056e11a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0952a20170f4da5a8b65715b63eb61a95660c91f7c523c2319102b675c02c7089b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a07e534fc870e517ff7a1920018b19adb1724082a93d615934b6fa69f67683f31388575213010c5ae0d0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8cc7d6596eae7e22f010a5eb9fce3d34f06cc3a1ff1e7b17da82678240f1048a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc605a09d17b5df8495f1a3f84ca817e914199c4d7b52010e30427903c21bd20",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xedc8e758aedba9ba8a2c71304c08c9ec2a7631ead4549ad6096d09ea5d456577",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0.json
index 6c0fb8074..e03374c2b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_001_OOGMAfter_d0g0v0_EIP150" : {
+    "callcallcallcode_001_OOGMAfter_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/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x5e5bab040a72b5e9cc97fc4d766f1450ec8f653b2df37294680eb6d9c46b6eb1",
-                    "mixHash" : "0x7d6bb80a26816be2de02e0d33ea1e3c85c243d38b20658dffffe3423d7a7506f",
-                    "nonce" : "0xa5ebb903cf12b932",
+                    "hash" : "0x9cf4bfbed875fbb1d5d80502bf0cbad8369596a13e86ee925dffd9082183c31b",
+                    "mixHash" : "0x4d755711c84f02b6aec03f3dd87465b712dcb5328bb3e55b014678ce2cda33ed",
+                    "nonce" : "0xe0e12d98c4a43338",
                     "number" : "0x01",
                     "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
-                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x51efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a07d6bb80a26816be2de02e0d33ea1e3c85c243d38b20658dffffe3423d7a7506f88a5ebb903cf12b932f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a04d755711c84f02b6aec03f3dd87465b712dcb5328bb3e55b014678ce2cda33ed88e0e12d98c4a43338f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e5bab040a72b5e9cc97fc4d766f1450ec8f653b2df37294680eb6d9c46b6eb1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9cf4bfbed875fbb1d5d80502bf0cbad8369596a13e86ee925dffd9082183c31b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_d0g0v0_EIP158" : {
+    "callcallcallcode_001_OOGMAfter_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/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xbc40563707b4c2a00aa1efb97e603cfb9d2365b40338f5863f842969206e0492",
-                    "mixHash" : "0xc80ff7251216dffc3cd85bbdd8aaeeae55e8b5d96602386bb98cca07efc43e40",
-                    "nonce" : "0xd6fcddd8d8894775",
+                    "hash" : "0xf059ceb52b0aa1327f75e681c230b90ccb4eebf153acdfa5fcac2f936aad1b0d",
+                    "mixHash" : "0xf17752325473c096b4da0305dea51b463873b4aec4b1c9195146372820be11a4",
+                    "nonce" : "0xe3f731dfe49c10af",
+                    "number" : "0x01",
+                    "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x51efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0f17752325473c096b4da0305dea51b463873b4aec4b1c9195146372820be11a488e3f731dfe49c10aff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf059ceb52b0aa1327f75e681c230b90ccb4eebf153acdfa5fcac2f936aad1b0d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x48bd7a5bf27b52d7dab4050bc0bb60b8b69372801108c333099d396c398e5f66",
+                    "mixHash" : "0x87c3b363f9b3acae4b81bb7817c4c6aabe3c91810591418307c8a6ccfec25087",
+                    "nonce" : "0x1ab01e4df3cf989b",
                     "number" : "0x01",
                     "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
                     "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0c80ff7251216dffc3cd85bbdd8aaeeae55e8b5d96602386bb98cca07efc43e4088d6fcddd8d8894775f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a087c3b363f9b3acae4b81bb7817c4c6aabe3c91810591418307c8a6ccfec25087881ab01e4df3cf989bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc40563707b4c2a00aa1efb97e603cfb9d2365b40338f5863f842969206e0492",
-        "network" : "EIP158",
+        "lastblockhash" : "0x48bd7a5bf27b52d7dab4050bc0bb60b8b69372801108c333099d396c398e5f66",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_d0g0v0_Frontier" : {
+    "callcallcallcode_001_OOGMAfter_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/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xf4b5c8d7866aee182d6d297604661b90f154b1ce4c7e18f61ffc852a503ff67e",
-                    "mixHash" : "0xcab827e4f9eb02de7dd20d2d01c32624e42d6caf1815ba75ab4b723a5a218f22",
-                    "nonce" : "0x00be4e2c3c392e06",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x3166afc4f6dfa00a30ce8e702f4f7c5935e8e7c729520097687a7c658c040671",
+                    "mixHash" : "0x69913c9a1dc37d578554f18b7cd57753eca7a2c22bccbd6eba4e5b0b35778902",
+                    "nonce" : "0xc7c34a6b44d06d73",
                     "number" : "0x01",
                     "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
-                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
+                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
+                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0cab827e4f9eb02de7dd20d2d01c32624e42d6caf1815ba75ab4b723a5a218f228800be4e2c3c392e06f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a069913c9a1dc37d578554f18b7cd57753eca7a2c22bccbd6eba4e5b0b3577890288c7c34a6b44d06d73f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4b5c8d7866aee182d6d297604661b90f154b1ce4c7e18f61ffc852a503ff67e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3166afc4f6dfa00a30ce8e702f4f7c5935e8e7c729520097687a7c658c040671",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_d0g0v0_Homestead" : {
+    "callcallcallcode_001_OOGMAfter_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/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x2f553f9278989337e166f2a9a17dcb98cce50c3864218402ec982d77283e5988",
-                    "mixHash" : "0x448f01d2117f0bceabd27a0911541e6aa5157a17a8ef9b3560f81d53b0b04b03",
-                    "nonce" : "0x26ff242a331b168c",
+                    "hash" : "0xfb41d46030d1c54e47ca9dae89ec9b33eea45d2f8c2e2d6dadf6985dd0c57b97",
+                    "mixHash" : "0xfee0e685cbbec640762efb7ad11d72e4b9614db5b8a0852cf47edc5fd71f2fab",
+                    "nonce" : "0x15e3384bc628ce7f",
                     "number" : "0x01",
                     "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
                     "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0448f01d2117f0bceabd27a0911541e6aa5157a17a8ef9b3560f81d53b0b04b038826ff242a331b168cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0fee0e685cbbec640762efb7ad11d72e4b9614db5b8a0852cf47edc5fd71f2fab8815e3384bc628ce7ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f553f9278989337e166f2a9a17dcb98cce50c3864218402ec982d77283e5988",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfb41d46030d1c54e47ca9dae89ec9b33eea45d2f8c2e2d6dadf6985dd0c57b97",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcallcallcode_001_OOGMAfter_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/stCallCodes/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x06ce510ea9f6b1b3ce80deda3e2f81ba8a49b02436a2cda6415948c4eb3bbbd1",
-                    "mixHash" : "0x37b458ecf4ec1fa26c7a8a86ce588f49b65519a867de3b214e5fbd894bc19acc",
-                    "nonce" : "0xd03ebc545f7caade",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xdca5ab1a78d7306620f9681692327ad45a90a2c0a2c2cd225c3f7744759b8591",
+                    "mixHash" : "0x31ab138d4bf115715ace017cb100cd13600b16c20ce7e1721c486c0112f47dc2",
+                    "nonce" : "0xcf626f2a09e9d815",
                     "number" : "0x01",
                     "parentHash" : "0x98f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0x51efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0c",
+                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
+                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a037b458ecf4ec1fa26c7a8a86ce588f49b65519a867de3b214e5fbd894bc19acc88d03ebc545f7caadef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a098f751711d647362566d1afba7077dfcd6f13503019f54618a2ce5209bf758e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a031ab138d4bf115715ace017cb100cd13600b16c20ce7e1721c486c0112f47dc288cf626f2a09e9d815f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06ce510ea9f6b1b3ce80deda3e2f81ba8a49b02436a2cda6415948c4eb3bbbd1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdca5ab1a78d7306620f9681692327ad45a90a2c0a2c2cd225c3f7744759b8591",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0.json
index 71a88b922..b23526efc 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_001_OOGMBefore_d0g0v0_EIP150" : {
+    "callcallcallcode_001_OOGMBefore_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/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xd75518a0f1d4c91dc33d2f9a639c1a1d4b9c5ffbb2fd080478d93cd87cba6639",
-                    "mixHash" : "0x0744ebb9a96c706105689b9766cd0b9563c14c5fd9e318dc208cfebb7a281aed",
-                    "nonce" : "0x54ba9fcd6bde6347",
+                    "hash" : "0x51f9a06da97dd539e6b8bc0f89b60e1536a140b740f5154b0f32010fee7ca2b3",
+                    "mixHash" : "0xff9c736e92342fb8221856e686681d13d143b25b91b77cba0a540f21cbeb698a",
+                    "nonce" : "0xfd0af8f488bce035",
                     "number" : "0x01",
                     "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "0xb57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
-                    "stateRoot" : "0xd0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098c",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xbb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a00744ebb9a96c706105689b9766cd0b9563c14c5fd9e318dc208cfebb7a281aed8854ba9fcd6bde6347f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0ff9c736e92342fb8221856e686681d13d143b25b91b77cba0a540f21cbeb698a88fd0af8f488bce035f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd75518a0f1d4c91dc33d2f9a639c1a1d4b9c5ffbb2fd080478d93cd87cba6639",
-        "network" : "EIP150",
+        "lastblockhash" : "0x51f9a06da97dd539e6b8bc0f89b60e1536a140b740f5154b0f32010fee7ca2b3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMBefore_d0g0v0_EIP158" : {
+    "callcallcallcode_001_OOGMBefore_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/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xa544ca9af3c5199821cf5ad749ab0e6adbe2dfcd66307611b71634a4f7df2ba6",
-                    "mixHash" : "0x3fe7b7743dd7b3e8e11d3861caf04bc8590114e730493c6f805aa1bb572ff178",
-                    "nonce" : "0xf29b3b1a46a331a6",
+                    "hash" : "0x14320a57ed38c5e7e0e738c1d1aae9ffb95d680f3f57f8113e1a3bb50c01c003",
+                    "mixHash" : "0x06472edd1dbf8a580094aa233cd0ebabfa4668fed96d2db4eb7b73836a2cdecf",
+                    "nonce" : "0x09c929593aaedd13",
+                    "number" : "0x01",
+                    "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xbb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a006472edd1dbf8a580094aa233cd0ebabfa4668fed96d2db4eb7b73836a2cdecf8809c929593aaedd13f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x14320a57ed38c5e7e0e738c1d1aae9ffb95d680f3f57f8113e1a3bb50c01c003",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x5062f3cbac9efbe67fa901069e4822008668854956c43cb8ac3d2ba4c15f3d56",
+                    "mixHash" : "0x8e16cb788a16c7dc0c105f466a1af9eb22eb7b0af96e780f204e531ce1d03208",
+                    "nonce" : "0x631878c11c2fb7d1",
                     "number" : "0x01",
                     "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
                     "receiptTrie" : "0xb57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a03fe7b7743dd7b3e8e11d3861caf04bc8590114e730493c6f805aa1bb572ff17888f29b3b1a46a331a6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08e16cb788a16c7dc0c105f466a1af9eb22eb7b0af96e780f204e531ce1d0320888631878c11c2fb7d1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa544ca9af3c5199821cf5ad749ab0e6adbe2dfcd66307611b71634a4f7df2ba6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5062f3cbac9efbe67fa901069e4822008668854956c43cb8ac3d2ba4c15f3d56",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMBefore_d0g0v0_Frontier" : {
+    "callcallcallcode_001_OOGMBefore_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/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xeb8be7e0969de49cb7f26c6e6d09739ad7384b0e08f31c4b0bcc96879a99ed9d",
-                    "mixHash" : "0xb356a86b4d63bff67ed1d2eed78218ae6a0387cb352aeb8ed53686f0876f40f7",
-                    "nonce" : "0x0bd64c92e59605e9",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xa7b8e83410b4c2c1a88d7206122f422bc1c52f3fba37f9836c7ccab93b7d9604",
+                    "mixHash" : "0x0c778a09acdd3fadb62b12c1aceaa8df9d5126d6473f15b68a23a0ee90f782d5",
+                    "nonce" : "0x1e2354b72ff9224b",
                     "number" : "0x01",
                     "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "0x49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
-                    "stateRoot" : "0xe3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142",
+                    "receiptTrie" : "0xb57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5e",
+                    "stateRoot" : "0xd0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b356a86b4d63bff67ed1d2eed78218ae6a0387cb352aeb8ed53686f0876f40f7880bd64c92e59605e9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0a4b037025c0fda66a2a48075794386b1b070fc6e7a9facb632c1bba40a098ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b57b5191c12efc12acf8270a3f0b679841a58faf644f08f165a3507c89037b5eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a00c778a09acdd3fadb62b12c1aceaa8df9d5126d6473f15b68a23a0ee90f782d5881e2354b72ff9224bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb8be7e0969de49cb7f26c6e6d09739ad7384b0e08f31c4b0bcc96879a99ed9d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa7b8e83410b4c2c1a88d7206122f422bc1c52f3fba37f9836c7ccab93b7d9604",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMBefore_d0g0v0_Homestead" : {
+    "callcallcallcode_001_OOGMBefore_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/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xf52cfb13d04d30c1dbaf57c6bfc9f1c073951f0dc98620c4b64c50b364691d35",
-                    "mixHash" : "0x20e7c048eb825e2a61d0dc5d79f9f21c54b3f774743f7d54a02e249d44bde27d",
-                    "nonce" : "0xbbff41672fc22eb0",
+                    "hash" : "0xe8c1c12911f3ff826ca8b50c13173ea48844d134cbf0e0e50f0d6768f0d50b28",
+                    "mixHash" : "0x38489b759a43ffbcf5fcd60d173f8f0c421f4305d324600318e20aa55f2acbca",
+                    "nonce" : "0x76c5f02d02584842",
                     "number" : "0x01",
                     "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
                     "receiptTrie" : "0x49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a020e7c048eb825e2a61d0dc5d79f9f21c54b3f774743f7d54a02e249d44bde27d88bbff41672fc22eb0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a038489b759a43ffbcf5fcd60d173f8f0c421f4305d324600318e20aa55f2acbca8876c5f02d02584842f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf52cfb13d04d30c1dbaf57c6bfc9f1c073951f0dc98620c4b64c50b364691d35",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe8c1c12911f3ff826ca8b50c13173ea48844d134cbf0e0e50f0d6768f0d50b28",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcallcallcode_001_OOGMBefore_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/stCallCodes/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0xc71c1235d7d5c6bc8d8115016d91efcf0577ed312b33d285ffbd3e79d564b39b",
-                    "mixHash" : "0x29221bf01f5e7e52c8c63d613bb8ba959c3433a09a6764bc5e4c13680f73c34e",
-                    "nonce" : "0xe96d5f6ac5587574",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xf6c28ae1b0105f8fba3303f06c19ce16fefbdc66fd772cb259f387536370f558",
+                    "mixHash" : "0x915dc474a298828031b3370cfa93603bd4a3f70c005e1424e34f1cf977b7d39d",
+                    "nonce" : "0x55d7ce1308038545",
                     "number" : "0x01",
                     "parentHash" : "0x25e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0xbb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2d",
+                    "receiptTrie" : "0x49b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20c",
+                    "stateRoot" : "0xe3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb23527ef3e6450619277bdd081ede03452cd2a3413af20648caef7ce4459c2da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a029221bf01f5e7e52c8c63d613bb8ba959c3433a09a6764bc5e4c13680f73c34e88e96d5f6ac5587574f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a025e2814512c054ca72d52c2504099b41f2576084020b7da63675301be59eb135a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3ef66f142b000c0fcf6488b423854d3f5ff326509941cddb6b29de7fa726142a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea049b26792a5dbba93596b68afcfaf2d597cccd379b5f4f997cfffb931123ac20cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0915dc474a298828031b3370cfa93603bd4a3f70c005e1424e34f1cf977b7d39d8855d7ce1308038545f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2216df0d7a95dc0206f0ac16149468d41d661d8db8b7d2207a40b6399642f6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc71c1235d7d5c6bc8d8115016d91efcf0577ed312b33d285ffbd3e79d564b39b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf6c28ae1b0105f8fba3303f06c19ce16fefbdc66fd772cb259f387536370f558",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0.json
index b55a22d2a..05485b3dc 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_001_SuicideEnd_d0g0v0_EIP150" : {
+    "callcallcallcode_001_SuicideEnd_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/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x278bb0fc8c54a65f2c6141628914e8abd92ae57b7cff42dc350e0a83286b07b2",
-                    "mixHash" : "0x373439c3fec5677d09d7e78dbf859ecd6a4b3fbb54700309374ed9ba65ade016",
-                    "nonce" : "0x8d1600ce14507731",
+                    "hash" : "0xa2140cf7be36d2ae01eebdf29bf58bbca31d4bb7bcdddba4dd80bb28dfe62f86",
+                    "mixHash" : "0x6c330711449088c8f563f981bc6bd7bf4126ef7c6673d7e742d7af20a9bb80a8",
+                    "nonce" : "0x3c4bb0843c3f05e0",
                     "number" : "0x01",
                     "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "0xc35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
-                    "stateRoot" : "0x5fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x6dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0373439c3fec5677d09d7e78dbf859ecd6a4b3fbb54700309374ed9ba65ade016888d1600ce14507731f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a06c330711449088c8f563f981bc6bd7bf4126ef7c6673d7e742d7af20a9bb80a8883c4bb0843c3f05e0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x278bb0fc8c54a65f2c6141628914e8abd92ae57b7cff42dc350e0a83286b07b2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa2140cf7be36d2ae01eebdf29bf58bbca31d4bb7bcdddba4dd80bb28dfe62f86",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideEnd_d0g0v0_EIP158" : {
+    "callcallcallcode_001_SuicideEnd_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/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xedd79f6097d406a41a9d421e175d890482b363c337262ad53c7ff46e1524529c",
-                    "mixHash" : "0xff88583bcaeb09beda875c032117913b8988a4a0353230ecb1f918195422e697",
-                    "nonce" : "0x50b798a987e8a39f",
+                    "hash" : "0x4795efd6a651584eccc1dbe78a73abb380134eea8a4feb036e5e3fde644ba67e",
+                    "mixHash" : "0x304cb91ee936f9337a2c935cba65bd003fdbd764a4072dc8057ad4e227c7e384",
+                    "nonce" : "0x2c35541da545bd0b",
+                    "number" : "0x01",
+                    "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x6dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0304cb91ee936f9337a2c935cba65bd003fdbd764a4072dc8057ad4e227c7e384882c35541da545bd0bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4795efd6a651584eccc1dbe78a73abb380134eea8a4feb036e5e3fde644ba67e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x04a817c800",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x1d320d2ab3d3728f265abf421563b49c32dabb8e4af4e2b7e6eb75fbba3914bb",
+                    "mixHash" : "0x155a3c01e9ff848e024a2961c8880aa6f1fb86782597fc88b63bf6883d25f3c8",
+                    "nonce" : "0x207092cf328be03a",
                     "number" : "0x01",
                     "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
                     "receiptTrie" : "0xc35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0ff88583bcaeb09beda875c032117913b8988a4a0353230ecb1f918195422e6978850b798a987e8a39ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0155a3c01e9ff848e024a2961c8880aa6f1fb86782597fc88b63bf6883d25f3c888207092cf328be03af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedd79f6097d406a41a9d421e175d890482b363c337262ad53c7ff46e1524529c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1d320d2ab3d3728f265abf421563b49c32dabb8e4af4e2b7e6eb75fbba3914bb",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideEnd_d0g0v0_Frontier" : {
+    "callcallcallcode_001_SuicideEnd_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/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0x18a82c91d64f4c7a1d789df7309fc8b4407699a2b0c8be03b5831186936b5e24",
-                    "mixHash" : "0xff15d4ab389d753b82a0a9b50256d94d1fb7a2776de7e68d5af80905f2da3785",
-                    "nonce" : "0xeeea8396c052425c",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x470862ef65a2af724d7b6150c85867eec571c8f2373f3b0878671a5f13119216",
+                    "mixHash" : "0x9429328fc017be8c261418ae71f7dd53d891f025b2cddcf33810ab0849521dbb",
+                    "nonce" : "0xe0c09d6ef363865e",
                     "number" : "0x01",
                     "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "0xe1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
-                    "stateRoot" : "0x7e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14",
+                    "receiptTrie" : "0xc35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0ea",
+                    "stateRoot" : "0x5fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0ff15d4ab389d753b82a0a9b50256d94d1fb7a2776de7e68d5af80905f2da378588eeea8396c052425cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fccd962fd660ab402c24cacbd0a6adfc860eb72d940fa7f8ac0ab8bd69b1fe6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c35983d8224de90fdfaa1d0e58a63e43f3c3f8773817bb85332f389f2a11a0eab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a09429328fc017be8c261418ae71f7dd53d891f025b2cddcf33810ab0849521dbb88e0c09d6ef363865ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18a82c91d64f4c7a1d789df7309fc8b4407699a2b0c8be03b5831186936b5e24",
-        "network" : "Frontier",
+        "lastblockhash" : "0x470862ef65a2af724d7b6150c85867eec571c8f2373f3b0878671a5f13119216",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideEnd_d0g0v0_Homestead" : {
+    "callcallcallcode_001_SuicideEnd_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/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0x1843b3e2131b057d9db09a404b607490a4292df23ef54ecb4b2baa061fb50281",
-                    "mixHash" : "0xb5853fa385af63910c1cd3732fc9bd3c680b8ed4bb4473e305e0e90ac2aa5867",
-                    "nonce" : "0x17037e01fb4158cb",
+                    "hash" : "0xe0874c1339ae9b14e34ec4c2dc2167644fce1e592d7c6928d289f046ad669efd",
+                    "mixHash" : "0x3eb6e6333a40f6fc81cb8f0d8bcfe1e281527d86d0995d219917ae9ce1b6a2ef",
+                    "nonce" : "0x0a5dd0f5298c4184",
                     "number" : "0x01",
                     "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
                     "receiptTrie" : "0xe1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0b5853fa385af63910c1cd3732fc9bd3c680b8ed4bb4473e305e0e90ac2aa58678817037e01fb4158cbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a03eb6e6333a40f6fc81cb8f0d8bcfe1e281527d86d0995d219917ae9ce1b6a2ef880a5dd0f5298c4184f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1843b3e2131b057d9db09a404b607490a4292df23ef54ecb4b2baa061fb50281",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe0874c1339ae9b14e34ec4c2dc2167644fce1e592d7c6928d289f046ad669efd",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcallcallcode_001_SuicideEnd_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/stCallCodes/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x314e4dbfca00f3e2306db93efe756ac607d60903bc00753c9503615ff700d5f9",
-                    "mixHash" : "0xe7d575b3524ef6dab05837feede9a2c6ab7b6818c34bcbaa6eae85bac8882976",
-                    "nonce" : "0x005c0e799b52d9ea",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0x2399cd97d8a007a9a8f0f08275e171ccf6a2cd1a8df8f41f2f8e6410344bb01e",
+                    "mixHash" : "0xab08fcb0dcbf9e2f15ef2d3099f301da54e4feaef39cb5ab09afc93d83861366",
+                    "nonce" : "0x6434ee9aa9c24986",
                     "number" : "0x01",
                     "parentHash" : "0xf09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0x6dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584c",
+                    "receiptTrie" : "0xe1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090",
+                    "stateRoot" : "0x7e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dbe810413e26dd667c3b2201beafe0b20d8b124016882a2272c4304e73f584ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0e7d575b3524ef6dab05837feede9a2c6ab7b6818c34bcbaa6eae85bac888297688005c0e799b52d9eaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f09edfa6fdf9325a8d4113cf11967687be9ad411228e93e138478d21e5fc0b71a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e186e63f107c38784349545cd0f092b23a0d110a146ade75a3dc0721a909d14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1ec66a79b7ac0301c094ab924ec3c654dab0f78d31d8b5b2502f9253aa0c090b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0ab08fcb0dcbf9e2f15ef2d3099f301da54e4feaef39cb5ab09afc93d83861366886434ee9aa9c24986f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057cf6cdde5a2670f529e5e68595a3495dbe10f07da4a0c6fcd7a6f43bfa021bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x314e4dbfca00f3e2306db93efe756ac607d60903bc00753c9503615ff700d5f9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2399cd97d8a007a9a8f0f08275e171ccf6a2cd1a8df8f41f2f8e6410344bb01e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0.json
index 3043253c7..47f933b53 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_001_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcallcallcode_001_SuicideMiddle_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/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x5bb7a70988b4528976ffcce42b9f1047e26b548c4ee134922b58b41588e598d0",
-                    "mixHash" : "0x9877c365da246c3fa6789c1a91e6dec0c2aec1b12bbfd3704cb6c283085fbd6c",
-                    "nonce" : "0x8b050ef7cd797d70",
+                    "hash" : "0x6a341fcbb499e78e5d0b62d36613b7d6ba4a1ddd9dca1ee7a16f06b624fdecbc",
+                    "mixHash" : "0x3d53ef1cd05076906b0157bdc831b6b0759628606216c03950cae14c9fa7459c",
+                    "nonce" : "0x1a018b67a56351e6",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a09877c365da246c3fa6789c1a91e6dec0c2aec1b12bbfd3704cb6c283085fbd6c888b050ef7cd797d70f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03d53ef1cd05076906b0157bdc831b6b0759628606216c03950cae14c9fa7459c881a018b67a56351e6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bb7a70988b4528976ffcce42b9f1047e26b548c4ee134922b58b41588e598d0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6a341fcbb499e78e5d0b62d36613b7d6ba4a1ddd9dca1ee7a16f06b624fdecbc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcallcallcode_001_SuicideMiddle_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/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xf022afc008f6447f023b9ebef7fe8c88d080f1ba4031dcb3e9e5a0a1e0372010",
-                    "mixHash" : "0x0e046bcd6c9559a963ce47ef3ff90a8497ab4cf93448df4d2ed84b6e1e3c796d",
-                    "nonce" : "0x269cfacca7a0ec66",
+                    "hash" : "0xf334af333d8fe2b6a01a57200ea617b91a1a6ee9b09b2dbf3875cc00554db92e",
+                    "mixHash" : "0xc980cd6aed9f8078dcbb1fb82a30e41923282035529411b6d15ac1930615035c",
+                    "nonce" : "0xce822ba693d73b77",
+                    "number" : "0x01",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0c980cd6aed9f8078dcbb1fb82a30e41923282035529411b6d15ac1930615035c88ce822ba693d73b77f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf334af333d8fe2b6a01a57200ea617b91a1a6ee9b09b2dbf3875cc00554db92e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x4b18908139f9067c630a0bc23224bae1daf70af51916dd43c9ae3cb8e59370c3",
+                    "mixHash" : "0x599f3b1994ab7fc30c2ed201dc524bfc52783b57c80661f39f2dba0d70142e0a",
+                    "nonce" : "0x98f3e69fde11daad",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
                     "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a00e046bcd6c9559a963ce47ef3ff90a8497ab4cf93448df4d2ed84b6e1e3c796d88269cfacca7a0ec66f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0599f3b1994ab7fc30c2ed201dc524bfc52783b57c80661f39f2dba0d70142e0a8898f3e69fde11daadf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf022afc008f6447f023b9ebef7fe8c88d080f1ba4031dcb3e9e5a0a1e0372010",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4b18908139f9067c630a0bc23224bae1daf70af51916dd43c9ae3cb8e59370c3",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcallcallcode_001_SuicideMiddle_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/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xf0446419293c41107750a5c0e837d0e62db084196ccfb85990c82d2bfb0ac189",
-                    "mixHash" : "0x49c6065ba2e8b9b8d546a43fc5e5fe05bb213f9d58d61f8128181467d4d1b2d3",
-                    "nonce" : "0x1fe00349687bdb37",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xc25c2306a0c11767940097ab7af8c132f5a76ab1b3cce1e04671e32a76b3ec23",
+                    "mixHash" : "0xccaccdae84272c3e124087456689b1862466167efa9ae399a346d3711e78e23e",
+                    "nonce" : "0xe0100632bed170fa",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a049c6065ba2e8b9b8d546a43fc5e5fe05bb213f9d58d61f8128181467d4d1b2d3881fe00349687bdb37f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0ccaccdae84272c3e124087456689b1862466167efa9ae399a346d3711e78e23e88e0100632bed170faf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0446419293c41107750a5c0e837d0e62db084196ccfb85990c82d2bfb0ac189",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc25c2306a0c11767940097ab7af8c132f5a76ab1b3cce1e04671e32a76b3ec23",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcallcallcode_001_SuicideMiddle_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/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0xc80d3853c55c9e353fe7011359c15af23f94e1957585d44223f813ed4bb82e6d",
-                    "mixHash" : "0x528c2b7382fc03ed6617e1b9993d539ac5be41aec91ca342df14605957b86e6d",
-                    "nonce" : "0x964fb47df2cf3e52",
+                    "hash" : "0x1d69ede6fb952acfc28c0384adf8b9c819a933dd29d2545d4d54c64f40f1e2e6",
+                    "mixHash" : "0x46e82c41c615fb9ec43a41d5c4d540a98dc2f43289386cee985509c548b9bbe4",
+                    "nonce" : "0xbb59a8dd2dc37787",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
                     "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0528c2b7382fc03ed6617e1b9993d539ac5be41aec91ca342df14605957b86e6d88964fb47df2cf3e52f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a046e82c41c615fb9ec43a41d5c4d540a98dc2f43289386cee985509c548b9bbe488bb59a8dd2dc37787f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc80d3853c55c9e353fe7011359c15af23f94e1957585d44223f813ed4bb82e6d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1d69ede6fb952acfc28c0384adf8b9c819a933dd29d2545d4d54c64f40f1e2e6",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcallcallcode_001_SuicideMiddle_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/stCallCodes/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x738c3b0e8a64e646e1abfaa238a296c00ce4818dfd73d5601c7452b0036f525a",
-                    "mixHash" : "0xbfc68f5ef625fd40437d014e1544feddef1db853f1fed510bcfda15a60fd9ca7",
-                    "nonce" : "0x6cc3df9b4a659eed",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x2891455e256f336d9595629362a9348a108db7a7eca687208e0991227e50509d",
+                    "mixHash" : "0xaf364ae119b014f10a24f16dedc57d638f90f74d51243e6b34ace445b1c484e5",
+                    "nonce" : "0x58415d2eccdcd883",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bfc68f5ef625fd40437d014e1544feddef1db853f1fed510bcfda15a60fd9ca7886cc3df9b4a659eedf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0af364ae119b014f10a24f16dedc57d638f90f74d51243e6b34ace445b1c484e58858415d2eccdcd883f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x738c3b0e8a64e646e1abfaa238a296c00ce4818dfd73d5601c7452b0036f525a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2891455e256f336d9595629362a9348a108db7a7eca687208e0991227e50509d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_d0g0v0.json
index 09b0d978b..dc934ba95 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_001_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_001_d0g0v0_EIP150" : {
+    "callcallcallcode_001_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/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xb3a78713c5a256dd25f0cb4ac5efac20a62ef72a8cfa2ea6e258fcc59562a98a",
-                    "mixHash" : "0x11041d925961b3f9cd11d19a1a5ad538b9f3bd54476a3fa7e7b83019ce9b9875",
-                    "nonce" : "0x96ddd8ef0abe3dcf",
+                    "hash" : "0xefaf517071afd69057acfb1a8b7432561dd6075a911ab9c7c0055453a41bd66d",
+                    "mixHash" : "0xcfb17876e9f22f336e20f6caf9273d54a13db4e6f2034bae8240e5b828efc101",
+                    "nonce" : "0xc991dacad01cf921",
                     "number" : "0x01",
                     "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "0x68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
-                    "stateRoot" : "0xbc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a011041d925961b3f9cd11d19a1a5ad538b9f3bd54476a3fa7e7b83019ce9b98758896ddd8ef0abe3dcff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0cfb17876e9f22f336e20f6caf9273d54a13db4e6f2034bae8240e5b828efc10188c991dacad01cf921f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3a78713c5a256dd25f0cb4ac5efac20a62ef72a8cfa2ea6e258fcc59562a98a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xefaf517071afd69057acfb1a8b7432561dd6075a911ab9c7c0055453a41bd66d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcallcallcode_001_d0g0v0_EIP158" : {
+    "callcallcallcode_001_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/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xe739bfea2c197bd0e3bfab9b2ca354078759a798a22d4d0ac7988144fff6e2b6",
-                    "mixHash" : "0x7c441676399ec411a76013542e230f5f73ff2482d60e9958616376c78ee6fdcb",
-                    "nonce" : "0x283f3e82b6434a36",
+                    "hash" : "0xfb4ed1a003183f789b6e3e2131cf67f33ac8177878c01cc53b5d7cbbb9f468d0",
+                    "mixHash" : "0x4bbe856e9832f7dddfdb9ae6c9c4d00dd8781df59219943d689162db841cc3c6",
+                    "nonce" : "0x134a8c100f4e3889",
+                    "number" : "0x01",
+                    "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a04bbe856e9832f7dddfdb9ae6c9c4d00dd8781df59219943d689162db841cc3c688134a8c100f4e3889f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39ac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfb4ed1a003183f789b6e3e2131cf67f33ac8177878c01cc53b5d7cbbb9f468d0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640002",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x014a" : "0x1000000000000000000000000000000000000002",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000002",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xf4e0d414413db906ae7e641b03aeb22a7b54924ef0080d4bd332be98806d699d",
+                    "mixHash" : "0x2cd0cd4c6ce14afd4b04e131714ae9a8d944cb711546374230d5ec26c45c338a",
+                    "nonce" : "0x94b10f1dd573ea50",
                     "number" : "0x01",
                     "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
                     "receiptTrie" : "0x68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07c441676399ec411a76013542e230f5f73ff2482d60e9958616376c78ee6fdcb88283f3e82b6434a36f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a02cd0cd4c6ce14afd4b04e131714ae9a8d944cb711546374230d5ec26c45c338a8894b10f1dd573ea50f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe739bfea2c197bd0e3bfab9b2ca354078759a798a22d4d0ac7988144fff6e2b6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf4e0d414413db906ae7e641b03aeb22a7b54924ef0080d4bd332be98806d699d",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcallcallcode_001_d0g0v0_Frontier" : {
+    "callcallcallcode_001_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/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0x237a36c974c08c645915c0f913eb5bca3b9bd44a2a3ac2363b966caf75ec0f5a",
-                    "mixHash" : "0x3b7d2ec0d2ee73009fe3574ea070eed1566e05847e23bd02f254bb993fc00ff7",
-                    "nonce" : "0x89f8879c09a0d3a4",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x0e49cefb7b8f2c2a5c5467bbc1b132e3c12e86f6b56e8b5e9783076ca6ba2bac",
+                    "mixHash" : "0x26ccbaf927aac676c5c84949451d00410c1e1ed006489b5daf5208319184dc99",
+                    "nonce" : "0x386391ace1c491b4",
                     "number" : "0x01",
                     "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "0x3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
-                    "stateRoot" : "0x630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5",
+                    "receiptTrie" : "0x68c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2e",
+                    "stateRoot" : "0xbc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a03b7d2ec0d2ee73009fe3574ea070eed1566e05847e23bd02f254bb993fc00ff78889f8879c09a0d3a4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc3f1bafaa4e50a4eb489a2244918d665cf0d7867602b2c2aac65519ff277280a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068c3cab12c4a6a124ddaed041f2619eeed7b5f61302c6a940e53553957f0fd2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a026ccbaf927aac676c5c84949451d00410c1e1ed006489b5daf5208319184dc9988386391ace1c491b4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x237a36c974c08c645915c0f913eb5bca3b9bd44a2a3ac2363b966caf75ec0f5a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0e49cefb7b8f2c2a5c5467bbc1b132e3c12e86f6b56e8b5e9783076ca6ba2bac",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcallcallcode_001_d0g0v0_Homestead" : {
+    "callcallcallcode_001_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/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0xbab7170d74919fa8c81e9e18fe416fc23f666895acb961cb90d8dc62300209bd",
-                    "mixHash" : "0x69ac7b0a88741fdb39cceeaed21e473b3f0171556a802cb716c1cb6cecc131d7",
-                    "nonce" : "0x2cfb8cddc86bfab3",
+                    "hash" : "0xc45c3c4a8d0266828c6429b10b0a532c4f19f62297b72fbc4a98c07886100503",
+                    "mixHash" : "0x72bdc01d3b441d64709b551f6a90ed27b5774353b62f514dd59bbaf0260fd004",
+                    "nonce" : "0x4623b1c1094cbda2",
                     "number" : "0x01",
                     "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
                     "receiptTrie" : "0x3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a069ac7b0a88741fdb39cceeaed21e473b3f0171556a802cb716c1cb6cecc131d7882cfb8cddc86bfab3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a072bdc01d3b441d64709b551f6a90ed27b5774353b62f514dd59bbaf0260fd004884623b1c1094cbda2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbab7170d74919fa8c81e9e18fe416fc23f666895acb961cb90d8dc62300209bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc45c3c4a8d0266828c6429b10b0a532c4f19f62297b72fbc4a98c07886100503",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcallcallcode_001_d0g0v0_Metropolis" : {
+    "callcallcallcode_001_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/stCallCodes/callcallcallcode_001_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0x37b555946960dcc49cad85422fe7a678dd1b95de99fdcb21777eb291c0bd2ef6",
-                    "mixHash" : "0x1702f912a530b3b18b7e87b7755b04afb4717dd337cd672be6406943ba84842f",
-                    "nonce" : "0xfb971aae3c110262",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0x4e7bfa4ff2ea79a66eaf2840c01e59f9fd36ee83b6eb18b06ba982f6693eba6a",
+                    "mixHash" : "0x62eb32346b126ca1f17b60689686c2c8bfea8c061ac2efd76670cdf256a3c5f6",
+                    "nonce" : "0x25a8eda9f9bf72e4",
                     "number" : "0x01",
                     "parentHash" : "0xf9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0x494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980d",
+                    "receiptTrie" : "0x3c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044f",
+                    "stateRoot" : "0x630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0494b0317a8de477d072292a5d7c22c46b0d1c9d8918e5b1d4ea6b2de4f70980da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a01702f912a530b3b18b7e87b7755b04afb4717dd337cd672be6406943ba84842f88fb971aae3c110262f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0f9d7e99189e245bcbb4808acaa4926a81b96df0a612aa45baa36065c3795a704a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0630b0621c39587b25aaa35019c0cf62e6f64f966f1d022b2cb5ce464426f0db5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03c775436b220dca4da14ea054c840cfd7088e61e639919c3d108360c4a3a044fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a062eb32346b126ca1f17b60689686c2c8bfea8c061ac2efd76670cdf256a3c5f68825a8eda9f9bf72e4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061bb4e4d92e93495e5d39a87e053d191fca7be6581de5e4a69ab5171396f39aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37b555946960dcc49cad85422fe7a678dd1b95de99fdcb21777eb291c0bd2ef6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4e7bfa4ff2ea79a66eaf2840c01e59f9fd36ee83b6eb18b06ba982f6693eba6a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
index 55853af98..9c5955f9f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0x5593b8e9d33a30ca7027a897294ebb52be64c7fe3093802a97b23e0c9b8c09d7",
-                    "mixHash" : "0x17846a44112d029f681aaaf577fcbf0ad9a97e69451ba73c273a4f856bab2e86",
-                    "nonce" : "0x3cf4e7410be0d564",
+                    "hash" : "0x8b2e75f6a4b98d1895292deba3184bc992c95e3fe715a31bb39e692547082809",
+                    "mixHash" : "0x104c99a1a3ef4a3c500c7037fb8b7a4574d6332cde2a8562aef910517fd0f733",
+                    "nonce" : "0x36ae862f19a0e6d9",
                     "number" : "0x01",
                     "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "0x249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
-                    "stateRoot" : "0xf02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x9185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a017846a44112d029f681aaaf577fcbf0ad9a97e69451ba73c273a4f856bab2e86883cf4e7410be0d564f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0104c99a1a3ef4a3c500c7037fb8b7a4574d6332cde2a8562aef910517fd0f7338836ae862f19a0e6d9f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5593b8e9d33a30ca7027a897294ebb52be64c7fe3093802a97b23e0c9b8c09d7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8b2e75f6a4b98d1895292deba3184bc992c95e3fe715a31bb39e692547082809",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcallcallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcallcallcode_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x1bae077a6b38257893654c5a67f6b3b2191d35807a62938d70e084598a3bb498",
+                    "mixHash" : "0x6db2f9766aebfdfce5009ac9f1430e2bab650bf43569b6a5e202167c2b256ab2",
+                    "nonce" : "0xa739ef0cc3ada66a",
+                    "number" : "0x01",
+                    "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x9185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06db2f9766aebfdfce5009ac9f1430e2bab650bf43569b6a5e202167c2b256ab288a739ef0cc3ada66af863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1bae077a6b38257893654c5a67f6b3b2191d35807a62938d70e084598a3bb498",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0x1fce5c7fcea287ff4fcc485fee0f0e98d044bc65b1d049f24dd600e5d4fc0a60",
-                    "mixHash" : "0xd44be7ac8a190261631f93408d6e54fdfb38f0f59f2a5a7b80570c8dc63e1b85",
-                    "nonce" : "0xc37df94bbf6b06a7",
+                    "hash" : "0xe1ebf98a5d20b373c64c5cc4e11ceaa9759147a43d83a1a3030463e926573d25",
+                    "mixHash" : "0x6f329727a3938b332e0e9f1dc6d6c79d5da54ea1b6c34d692783cb011b93d180",
+                    "nonce" : "0xbf0a79c72ea477b0",
                     "number" : "0x01",
                     "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
                     "receiptTrie" : "0x249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0d44be7ac8a190261631f93408d6e54fdfb38f0f59f2a5a7b80570c8dc63e1b8588c37df94bbf6b06a7f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06f329727a3938b332e0e9f1dc6d6c79d5da54ea1b6c34d692783cb011b93d18088bf0a79c72ea477b0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fce5c7fcea287ff4fcc485fee0f0e98d044bc65b1d049f24dd600e5d4fc0a60",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe1ebf98a5d20b373c64c5cc4e11ceaa9759147a43d83a1a3030463e926573d25",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcallcallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0xa44c4b60622efd54e7d8c991b1803573aab08f2eee26492163cc2b096ef7c540",
-                    "mixHash" : "0xd436ad3331f52714e6ce8e1b2bb9d041f133a93cb69d9ba26690335a3b753c66",
-                    "nonce" : "0x74bb8a7a627a9c76",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x850cd6c0f4b95d3b1911308584fd0feea00c87d4a3a48466257e98597bede818",
+                    "mixHash" : "0x009b7e1bdc7e76ae9b5fda8ec7bcad1988e5a5bbfae96d00c8de0c1a37237866",
+                    "nonce" : "0xd8a4687fb7424c77",
                     "number" : "0x01",
                     "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "0x681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
-                    "stateRoot" : "0x0aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944c",
+                    "receiptTrie" : "0x249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648",
+                    "stateRoot" : "0xf02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d436ad3331f52714e6ce8e1b2bb9d041f133a93cb69d9ba26690335a3b753c668874bb8a7a627a9c76f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f02b37a44169b0295ac16b65b469237f0603db1170ea01c091709bcdef931cb8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0249c8967e08dd0774943225b8432817fb402de738281341e24d762d5505e2648b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0009b7e1bdc7e76ae9b5fda8ec7bcad1988e5a5bbfae96d00c8de0c1a3723786688d8a4687fb7424c77f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa44c4b60622efd54e7d8c991b1803573aab08f2eee26492163cc2b096ef7c540",
-        "network" : "Frontier",
+        "lastblockhash" : "0x850cd6c0f4b95d3b1911308584fd0feea00c87d4a3a48466257e98597bede818",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcallcallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x08faa428afa07ed087d50a7884401e0d9f78a083e5392b5ff92b51f4e6a3cf13",
-                    "mixHash" : "0x8eecbdd70d05c953a43d64bb1532eb267c5acb68e8ab9458f36a4e78fde31c75",
-                    "nonce" : "0x5466bbc0cf021702",
+                    "hash" : "0x0189b7c87aa4c90c8ad18f6f6f113a62f662b1f6b3cdbf31db46f30eb80feec9",
+                    "mixHash" : "0x2bdb67e57febdda9e2d05e460dbfcecc03a01a501b8472a33ed2671b14164dae",
+                    "nonce" : "0x33b0eadbe75fdf79",
                     "number" : "0x01",
                     "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
                     "receiptTrie" : "0x681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a08eecbdd70d05c953a43d64bb1532eb267c5acb68e8ab9458f36a4e78fde31c75885466bbc0cf021702f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a02bdb67e57febdda9e2d05e460dbfcecc03a01a501b8472a33ed2671b14164dae8833b0eadbe75fdf79f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08faa428afa07ed087d50a7884401e0d9f78a083e5392b5ff92b51f4e6a3cf13",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0189b7c87aa4c90c8ad18f6f6f113a62f662b1f6b3cdbf31db46f30eb80feec9",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcallcallcode_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0x7ebd96cb5ab32a2ddc45092f7089c52f61231121d420e0f4ccc01259a1e6a31b",
-                    "mixHash" : "0x14b407e57d974023243b5cf284eca70cf4d399b495c39359028b23e359bb3cf4",
-                    "nonce" : "0x1b0ea9630b3f9b1f",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0x89bd911ad4c6769639f9dc91cf6d11ade269a9a1a87b6faa7e23d0fe19bc260d",
+                    "mixHash" : "0x4ad2c817ab3d408a44e3da6a296082e84d1c8d44f9bccbb1ff7b155cd0edc60b",
+                    "nonce" : "0xc26daeaa2c280c8e",
                     "number" : "0x01",
                     "parentHash" : "0xb57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802ab",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0x9185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348",
+                    "receiptTrie" : "0x681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168",
+                    "stateRoot" : "0x0aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09185a886996d59c60175cb8123ab49b1c9183a897fc24b835ada5ec49c78b348a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a014b407e57d974023243b5cf284eca70cf4d399b495c39359028b23e359bb3cf4881b0ea9630b3f9b1ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0b57e84eadd020b5afcf3a796e3c504eaeaf140832cc1d70381212692edf802aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aa2296e839302d219634ad373fc5ec117341c6f7b1c2d14b0e8668e3a8e944ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0681f5ac382d143b1dc072fd643ff6e17c60f0b3a3d52ea9b4eb873bb9ce68168b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a04ad2c817ab3d408a44e3da6a296082e84d1c8d44f9bccbb1ff7b155cd0edc60b88c26daeaa2c280c8ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ead1739dfe9009e8f6f516e339e3b968d9235b283f7f74f3c4d96ee578ae182fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ebd96cb5ab32a2ddc45092f7089c52f61231121d420e0f4ccc01259a1e6a31b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x89bd911ad4c6769639f9dc91cf6d11ade269a9a1a87b6faa7e23d0fe19bc260d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE_d0g0v0.json
index 1d8f4a973..f21fb0c7e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcode_01_OOGE_d0g0v0_EIP150" : {
+    "callcallcode_01_OOGE_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/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0x28e165c3bff953926a87810b94ad35d9d1ed113ca37e789ed6bbd732d98ea5a4",
-                    "mixHash" : "0x454d004c81159bc6af09642455964f86825320bb46de0d776bc4b8c530d52c9a",
-                    "nonce" : "0xa29f736f36fd6f92",
+                    "hash" : "0x848f2c360509af8cc7cb68b99c5d1b00738e35dc2d583fa850646312d0d64425",
+                    "mixHash" : "0xc91b4fc3096193ddd969b92b83228d66a150d451d29f669565bfc9466184010f",
+                    "nonce" : "0xd92a0bb17e7fdee5",
                     "number" : "0x01",
                     "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "0xf7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
-                    "stateRoot" : "0xbbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0xd5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0454d004c81159bc6af09642455964f86825320bb46de0d776bc4b8c530d52c9a88a29f736f36fd6f92f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0c91b4fc3096193ddd969b92b83228d66a150d451d29f669565bfc9466184010f88d92a0bb17e7fdee5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28e165c3bff953926a87810b94ad35d9d1ed113ca37e789ed6bbd732d98ea5a4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x848f2c360509af8cc7cb68b99c5d1b00738e35dc2d583fa850646312d0d64425",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -133,10 +140,10 @@
             }
         }
     },
-    "callcallcode_01_OOGE_d0g0v0_EIP158" : {
+    "callcallcode_01_OOGE_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/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -148,9 +155,150 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0xa1b7a881534c9f403e98fd26530351a7ab8f4c536b9480aa8789227efcce3f32",
-                    "mixHash" : "0xc912d97ca8da598550d905886263339bcf565ba0c694db5ce61feb3a5e92fb58",
-                    "nonce" : "0xb3383ea24d945915",
+                    "hash" : "0xb57e5315bc971eed452513fd264d58e7b8feb5f5febc6da11dfb87ee859e8d72",
+                    "mixHash" : "0xcbf9124a3597a5bf039f424f097bfb0c7b2eb67fdf06108604c2115325295454",
+                    "nonce" : "0x7e7ef490c449e1f7",
+                    "number" : "0x01",
+                    "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0xd5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0cbf9124a3597a5bf039f424f097bfb0c7b2eb67fdf06108604c2115325295454887e7ef490c449e1f7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb57e5315bc971eed452513fd264d58e7b8feb5f5febc6da11dfb87ee859e8d72",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50798",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762f868",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcode_01_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x57301d16f96c10c0c359e7049d6d092fb64509388191c2207ffa0de52c492bee",
+                    "mixHash" : "0x9d1741702abe3bae9c9532cae8bcdb0ea96d2694a8e8a45a56e16ea2e41227d3",
+                    "nonce" : "0x1684b4cfadae689a",
                     "number" : "0x01",
                     "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
                     "receiptTrie" : "0xf7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
@@ -159,7 +307,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0c912d97ca8da598550d905886263339bcf565ba0c694db5ce61feb3a5e92fb5888b3383ea24d945915f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a09d1741702abe3bae9c9532cae8bcdb0ea96d2694a8e8a45a56e16ea2e41227d3881684b4cfadae689af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -196,8 +344,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1b7a881534c9f403e98fd26530351a7ab8f4c536b9480aa8789227efcce3f32",
-        "network" : "EIP158",
+        "lastblockhash" : "0x57301d16f96c10c0c359e7049d6d092fb64509388191c2207ffa0de52c492bee",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -267,10 +415,10 @@
             }
         }
     },
-    "callcallcode_01_OOGE_d0g0v0_Frontier" : {
+    "callcallcode_01_OOGE_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/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +429,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010270",
-                    "hash" : "0xc76abf391ebd8ac7319a297051722bcabf13a701cb6897e529c43b8cf048e775",
-                    "mixHash" : "0xcf04ade3caa0b39f2ee4933285dfed1f8370ccea034fb07ed7c43ca716b0d3fc",
-                    "nonce" : "0x3a3645c2cb3cad03",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x9b7759e2170bdb7022dd9807c74e436939720959e7acae1ce733256026c86178",
+                    "mixHash" : "0x06eb9bc4294844b5d5459987766fb592cab9fb93eb8e81afad049e06a41381d1",
+                    "nonce" : "0x852d1a5a1d745313",
                     "number" : "0x01",
                     "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "0xe63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
-                    "stateRoot" : "0x151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9",
+                    "receiptTrie" : "0xf7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5",
+                    "stateRoot" : "0xbbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0cf04ade3caa0b39f2ee4933285dfed1f8370ccea034fb07ed7c43ca716b0d3fc883a3645c2cb3cad03f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbf0fa12937cca40d0c22311ebdc094cbe1dc4dc3986a7bed4dd7664d85952d8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f7b5e56f5467b1b17ce5f01eaaf1b8fe2e6b7e38b5d43b143ecb982f78cb51e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a006eb9bc4294844b5d5459987766fb592cab9fb93eb8e81afad049e06a41381d188852d1a5a1d745313f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -330,8 +478,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc76abf391ebd8ac7319a297051722bcabf13a701cb6897e529c43b8cf048e775",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9b7759e2170bdb7022dd9807c74e436939720959e7acae1ce733256026c86178",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,14 +504,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50270",
+                "balance" : "0x4563918244f50798",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd90",
+                "balance" : "0x0de0b6b3a762f868",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -401,10 +549,10 @@
             }
         }
     },
-    "callcallcode_01_OOGE_d0g0v0_Homestead" : {
+    "callcallcode_01_OOGE_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/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -416,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "0x816e37af6789e2f83f12c9fc940bf599e3054dad8dd1a25df2ed6490dbd61a98",
-                    "mixHash" : "0x5d5422f85954a20d9152ea150b55e23dec24162efe48658ddefb3f95f2cdfdc8",
-                    "nonce" : "0x7612f26116bab40b",
+                    "hash" : "0xae2734610a80a46721e9dabcd815744ae5f951859fe88e73d254a5b850267d65",
+                    "mixHash" : "0xc64c7582bcf9c7cbef3d20243d02ac2ba968a15387bda3f5212e261531fd0ce3",
+                    "nonce" : "0xa33f2041201a701b",
                     "number" : "0x01",
                     "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
                     "receiptTrie" : "0xe63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
@@ -427,7 +575,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a05d5422f85954a20d9152ea150b55e23dec24162efe48658ddefb3f95f2cdfdc8887612f26116bab40bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0c64c7582bcf9c7cbef3d20243d02ac2ba968a15387bda3f5212e261531fd0ce388a33f2041201a701bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -464,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x816e37af6789e2f83f12c9fc940bf599e3054dad8dd1a25df2ed6490dbd61a98",
-        "network" : "Homestead",
+        "lastblockhash" : "0xae2734610a80a46721e9dabcd815744ae5f951859fe88e73d254a5b850267d65",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -535,10 +683,10 @@
             }
         }
     },
-    "callcallcode_01_OOGE_d0g0v0_Metropolis" : {
+    "callcallcode_01_OOGE_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/stCallCodes/callcallcode_01_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -549,19 +697,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010798",
-                    "hash" : "0x26ad6b38bdd1c351d3b425932693dc02932c56352071b8de8e004386f8d574e2",
-                    "mixHash" : "0x6fd4ae660a060e49fd57c89c31d7d496e5b33d3584cef11888227e0012162cf9",
-                    "nonce" : "0x2bbd568a0def4d4f",
+                    "gasUsed" : "0x010270",
+                    "hash" : "0x45e14011ec4c79550939ca3a2a3181b9f3c07428a6e9b2b8a5bd4900f95b2dcd",
+                    "mixHash" : "0x28a35d625cd65516791ffb616f34cb8b12f983435cd123d79ed0b62cab76af77",
+                    "nonce" : "0x73ec6deae39ee1a1",
                     "number" : "0x01",
                     "parentHash" : "0x20db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4",
-                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
-                    "stateRoot" : "0xd5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37",
+                    "receiptTrie" : "0xe63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54",
+                    "stateRoot" : "0x151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5362d0a4d9d05b1d1a535867308020ab4d4c0117c6854a7f3f202620619fd37a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a06fd4ae660a060e49fd57c89c31d7d496e5b33d3584cef11888227e0012162cf9882bbd568a0def4d4ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a020db9894d5fe032b62cbd0742f7c07dcd5e71461c2eef7b37c66cbb4d7bb63d4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0151c832284e7237fa515255a46d236b002e0772877fa290b800121a67f9a5bb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e63850d1813a969121cc922418f109ac515ea12d56b4df9f15e5e507ebc40e54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a028a35d625cd65516791ffb616f34cb8b12f983435cd123d79ed0b62cab76af778873ec6deae39ee1a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -598,16 +746,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08e9e91e6f107559d9eb9f6348ec3e2dd7a4a8f4e3bcc762d63fea069e4bc1a6ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26ad6b38bdd1c351d3b425932693dc02932c56352071b8de8e004386f8d574e2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x45e14011ec4c79550939ca3a2a3181b9f3c07428a6e9b2b8a5bd4900f95b2dcd",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -631,14 +772,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50798",
+                "balance" : "0x4563918244f50270",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f868",
+                "balance" : "0x0de0b6b3a762fd90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0.json
index 50883eb5b..2ed95ca44 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcode_01_SuicideEnd_d0g0v0_EIP150" : {
+    "callcallcode_01_SuicideEnd_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/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x5bf57d95cfb3ba490d960a9e3b297bdf4d197281b1d1879aa0ccf48cb17a1b1b",
-                    "mixHash" : "0x187bfc377d9e255732f62388c340fa67c74573304db73482191d9f372aa182d5",
-                    "nonce" : "0x1347b6426d113879",
+                    "hash" : "0x0f82c80b4412a1e38738088f5cafb1815d42410143fd1424f679e5212bc4f370",
+                    "mixHash" : "0xb8ee4f3b5088d86765bb0ee24926dc038dcfd7069a99e1632f68361cddf3b415",
+                    "nonce" : "0x415d591bb88944d1",
                     "number" : "0x01",
                     "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "0xdc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
-                    "stateRoot" : "0x795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14a",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xd2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0187bfc377d9e255732f62388c340fa67c74573304db73482191d9f372aa182d5881347b6426d113879f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0b8ee4f3b5088d86765bb0ee24926dc038dcfd7069a99e1632f68361cddf3b41588415d591bb88944d1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bf57d95cfb3ba490d960a9e3b297bdf4d197281b1d1879aa0ccf48cb17a1b1b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0f82c80b4412a1e38738088f5cafb1815d42410143fd1424f679e5212bc4f370",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -126,10 +133,144 @@
             }
         }
     },
-    "callcallcode_01_SuicideEnd_d0g0v0_EIP158" : {
+    "callcallcode_01_SuicideEnd_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xa716afd6f48c7c1a317152d0bf69f80a38a56c9550fa7632cff64708b558f998",
+                    "mixHash" : "0xa5670deaafbb68e386575ac90d31c6b8c64daf21b0a5749abc370dcb02067c0f",
+                    "nonce" : "0x30a194efe54f871f",
+                    "number" : "0x01",
+                    "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xd2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0a5670deaafbb68e386575ac90d31c6b8c64daf21b0a5749abc370dcb02067c0f8830a194efe54f871ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa716afd6f48c7c1a317152d0bf69f80a38a56c9550fa7632cff64708b558f998",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f7ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630813",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcode_01_SuicideEnd_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/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -141,9 +282,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x5f20e5b70d87a086aaf5493b4685491175c43311985d9ea5b89067b347cc18ea",
-                    "mixHash" : "0xc96af6d5e75ec8230854f384ebda778979fd01f06d0dd0ad8fcd37485073803c",
-                    "nonce" : "0xae4fb1962ffc7b94",
+                    "hash" : "0xbc9f3580dcef77da3335c6b4689119508d7c1fa43e04a80c2e6450e23592f335",
+                    "mixHash" : "0xfe0bf68ce0a916168341779f392af03adbad8dec026240f50a45f22693ae97f9",
+                    "nonce" : "0x0d4d9db87a71f415",
                     "number" : "0x01",
                     "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
                     "receiptTrie" : "0xdc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
@@ -152,7 +293,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0c96af6d5e75ec8230854f384ebda778979fd01f06d0dd0ad8fcd37485073803c88ae4fb1962ffc7b94f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0fe0bf68ce0a916168341779f392af03adbad8dec026240f50a45f22693ae97f9880d4d9db87a71f415f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,8 +330,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f20e5b70d87a086aaf5493b4685491175c43311985d9ea5b89067b347cc18ea",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbc9f3580dcef77da3335c6b4689119508d7c1fa43e04a80c2e6450e23592f335",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -253,10 +394,10 @@
             }
         }
     },
-    "callcallcode_01_SuicideEnd_d0g0v0_Frontier" : {
+    "callcallcode_01_SuicideEnd_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/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -267,19 +408,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3d",
-                    "hash" : "0x14f84d78579a098efc4af536ce553db5909b0de6817c30d8fe8c4bd458df21e7",
-                    "mixHash" : "0xec2c271becca9cc1acb127abab32eeb41c0085fcddf2a520442cea1a4923d17c",
-                    "nonce" : "0xddf7a01821ad5cfd",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0x3992f1b3a475960c03d933b2eb235c058dabd77a17aee5a62e0938cc7d1b38d8",
+                    "mixHash" : "0x8fe8a82e526a6c987d062affda7aba40a9b91911af78b35a120320250edd9e77",
+                    "nonce" : "0x7e03c07495972ad7",
                     "number" : "0x01",
                     "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "0x893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
-                    "stateRoot" : "0x82daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0",
+                    "receiptTrie" : "0xdc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8",
+                    "stateRoot" : "0x795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0ec2c271becca9cc1acb127abab32eeb41c0085fcddf2a520442cea1a4923d17c88ddf7a01821ad5cfdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0795c5c6c597d917f07b596ccf61eaa9b2a08eed9575065a67cc9fe52c4f7a14aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dc8e4a35c328ff67b97192639d1b692d2805d665897e650d57c6c6d7763dcfa8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a08fe8a82e526a6c987d062affda7aba40a9b91911af78b35a120320250edd9e77887e03c07495972ad7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,8 +457,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14f84d78579a098efc4af536ce553db5909b0de6817c30d8fe8c4bd458df21e7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3992f1b3a475960c03d933b2eb235c058dabd77a17aee5a62e0938cc7d1b38d8",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -335,14 +476,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3d",
+                "balance" : "0x4563918244f4f7ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c3",
+                "balance" : "0x0de0b6b3a7630813",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -380,10 +521,10 @@
             }
         }
     },
-    "callcallcode_01_SuicideEnd_d0g0v0_Homestead" : {
+    "callcallcode_01_SuicideEnd_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/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -395,9 +536,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0x58df58af65d9919ea8d85c49c6f621ccb4fedd97471687c71e36e48675f6ef3d",
-                    "mixHash" : "0x19e13e27609556a3253ff618975af14e2ada6509f5185fd6f4d4769bb3a41650",
-                    "nonce" : "0x2bf73e99a876db47",
+                    "hash" : "0x650a6f7dcace5fdbb4bf41a10790f708e6063aa897999445c7b9e053b69ce7e2",
+                    "mixHash" : "0x03f78ef37d83eb6e20a2124bc5ea097bab3a6dcc9a949e4014636d0f1002ab5d",
+                    "nonce" : "0xb0092a146ad534b8",
                     "number" : "0x01",
                     "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
                     "receiptTrie" : "0x893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
@@ -406,7 +547,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a019e13e27609556a3253ff618975af14e2ada6509f5185fd6f4d4769bb3a41650882bf73e99a876db47f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a003f78ef37d83eb6e20a2124bc5ea097bab3a6dcc9a949e4014636d0f1002ab5d88b0092a146ad534b8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -443,8 +584,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58df58af65d9919ea8d85c49c6f621ccb4fedd97471687c71e36e48675f6ef3d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x650a6f7dcace5fdbb4bf41a10790f708e6063aa897999445c7b9e053b69ce7e2",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -507,10 +648,10 @@
             }
         }
     },
-    "callcallcode_01_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcallcode_01_SuicideEnd_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/stCallCodes/callcallcode_01_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -521,19 +662,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ed",
-                    "hash" : "0x4d076b685c92435719940d0bd6bb822cded02d77f8a5982bbad3d0d931cd2e56",
-                    "mixHash" : "0xa853324ef2bdce05664cdc7cd575d796bee6244b674b0d503822289100049f9e",
-                    "nonce" : "0xe30dfaa113ab5e56",
+                    "gasUsed" : "0xdf3d",
+                    "hash" : "0x99a11e5af2d56711e00612c31255b67244ace11760ce3e9f6fac7c4f0bee5548",
+                    "mixHash" : "0xf46ee927454c6e2f3c5bd35cb0484e65f35639e0af83d36e3cf73d8bf5b57c80",
+                    "nonce" : "0xab056f75ceca7b27",
                     "number" : "0x01",
                     "parentHash" : "0x6b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120",
-                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
-                    "stateRoot" : "0xd2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200",
+                    "receiptTrie" : "0x893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226",
+                    "stateRoot" : "0x82daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b31c26b5fb837335808a91d5eda03a82b9111a49685513f0e93a194e965200a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0a853324ef2bdce05664cdc7cd575d796bee6244b674b0d503822289100049f9e88e30dfaa113ab5e56f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a06b40db59c66c5f45320b6995c8069b9ffbbd3bbdb6f3599567186d388d50a120a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082daea0e72448198306a7e3d326ba9fd4055d1dbebd044f54d282d63aaa103f0a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0893d3c9bb61b01119d06c9035f0d5778f2609d97e156d4edbb2c46d9d1ab5226b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0f46ee927454c6e2f3c5bd35cb0484e65f35639e0af83d36e3cf73d8bf5b57c8088ab056f75ceca7b27f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -570,16 +711,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf9da25daced2ab58bc8a6f47cd2c2de94a26ef85ee94b75a349d97047f82205a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d076b685c92435719940d0bd6bb822cded02d77f8a5982bbad3d0d931cd2e56",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x99a11e5af2d56711e00612c31255b67244ace11760ce3e9f6fac7c4f0bee5548",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -596,14 +730,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ed",
+                "balance" : "0x4563918244f4df3d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630813",
+                "balance" : "0x0de0b6b3a76320c3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_d0g0v0.json
index ac694ad22..491f2ada1 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcode_01_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcode_01_d0g0v0_EIP150" : {
+    "callcallcode_01_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/stCallCodes/callcallcode_01_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0xfc5360428ef9104657b7dec82c86e1a6febcfadad271643a60c79d88f95fe5e7",
-                    "mixHash" : "0x54c39173b6b1480ded5171d0c74809f6dc2bf39ff1728fe1699fb376e7484d94",
-                    "nonce" : "0xda4c08e3a76a2cee",
+                    "hash" : "0x350f66a816930499da18e8e2cb0d369eb3bc73e3b78308a942e11c05b2c79f3c",
+                    "mixHash" : "0xc0fd70a3cd0b6617f3a1ef75ed1a098b8243be6b7f6cd55f953d9aa6586e24e4",
+                    "nonce" : "0x41e3d76a7f7f0036",
                     "number" : "0x01",
                     "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "0xb167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
-                    "stateRoot" : "0xd203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dd",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x94728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a054c39173b6b1480ded5171d0c74809f6dc2bf39ff1728fe1699fb376e7484d9488da4c08e3a76a2ceef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0c0fd70a3cd0b6617f3a1ef75ed1a098b8243be6b7f6cd55f953d9aa6586e24e48841e3d76a7f7f0036f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc5360428ef9104657b7dec82c86e1a6febcfadad271643a60c79d88f95fe5e7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x350f66a816930499da18e8e2cb0d369eb3bc73e3b78308a942e11c05b2c79f3c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -142,10 +149,160 @@
             }
         }
     },
-    "callcallcode_01_d0g0v0_EIP158" : {
+    "callcallcode_01_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcode_01_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x43463712ec24cbb7060ca60d7615484b17f42ac78261b8fb077d8d66e1b109d8",
+                    "mixHash" : "0x22ee05f99f09e888d34b33ccce443d856205999e2829d0f41e5086c1ac2a7dd6",
+                    "nonce" : "0xd26febb82d531930",
+                    "number" : "0x01",
+                    "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x94728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a022ee05f99f09e888d34b33ccce443d856205999e2829d0f41e5086c1ac2a7dd688d26febb82d531930f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x43463712ec24cbb7060ca60d7615484b17f42ac78261b8fb077d8d66e1b109d8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640001",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000001",
+                    "0x07" : "0x02",
+                    "0xe6" : "0x1000000000000000000000000000000000000001",
+                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0xec" : "0x40",
+                    "0xee" : "0x21",
+                    "0xf0" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f7997d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7606683",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcode_01_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/stCallCodes/callcallcode_01_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -157,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0x11ebc505fe1bdd3b07cb9a933595bbc65d286d90bbc54e3097bd463b86d929f7",
-                    "mixHash" : "0x3d9c6166012e5dca499bd2da16433b53807c90d2702c2fe31a814d7c1826b523",
-                    "nonce" : "0x5b1e920a07eb46bb",
+                    "hash" : "0x2153295a8a2722728ffcaa4aa3e60f1a2b170572e054efd4cc47202f17f549a3",
+                    "mixHash" : "0x0dcdaf8e64bce06474bd9e09a2dcd35291d8dbb7aa5519571cfa050fedc1386e",
+                    "nonce" : "0x531854a7509b0fb2",
                     "number" : "0x01",
                     "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
                     "receiptTrie" : "0xb167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
@@ -168,7 +325,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a03d9c6166012e5dca499bd2da16433b53807c90d2702c2fe31a814d7c1826b523885b1e920a07eb46bbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a00dcdaf8e64bce06474bd9e09a2dcd35291d8dbb7aa5519571cfa050fedc1386e88531854a7509b0fb2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -205,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11ebc505fe1bdd3b07cb9a933595bbc65d286d90bbc54e3097bd463b86d929f7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2153295a8a2722728ffcaa4aa3e60f1a2b170572e054efd4cc47202f17f549a3",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -285,10 +442,10 @@
             }
         }
     },
-    "callcallcode_01_d0g0v0_Frontier" : {
+    "callcallcode_01_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/stCallCodes/callcallcode_01_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -299,19 +456,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x039455",
-                    "hash" : "0x404383f8e0d5b5c5ec7f66cefb26fd87ad01495924f7b46cc35899ac3b60991b",
-                    "mixHash" : "0x58fae47fc10345dd308cf930422a54222e97ced3b431a270d81284176b2db6be",
-                    "nonce" : "0xfe634d22722481be",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x39cdf5a23049a78ec931b0be331d99ab3d2434e2a0b547b622f7f08e351a20ae",
+                    "mixHash" : "0xe0b3a8142daf9b9c4d0fa648c4f09b7a4ce2abc460d87346cd67e1bf6f322b4f",
+                    "nonce" : "0xe4974e92a5928729",
                     "number" : "0x01",
                     "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "0xe51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
-                    "stateRoot" : "0x8c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1",
+                    "receiptTrie" : "0xb167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035a",
+                    "stateRoot" : "0xd203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a058fae47fc10345dd308cf930422a54222e97ced3b431a270d81284176b2db6be88fe634d22722481bef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d203d1d8037f37ef3d357fe745e5c383d526a0ed650e80ae809b68112693b4dda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b167726f212e6cde4fa3e73d2890c64b2f7114d1dc5fa2ada765e887472d035ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0e0b3a8142daf9b9c4d0fa648c4f09b7a4ce2abc460d87346cd67e1bf6f322b4f88e4974e92a5928729f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -348,8 +505,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x404383f8e0d5b5c5ec7f66cefb26fd87ad01495924f7b46cc35899ac3b60991b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x39cdf5a23049a78ec931b0be331d99ab3d2434e2a0b547b622f7f08e351a20ae",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -383,14 +540,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79455",
+                "balance" : "0x4563918244f7997d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606bab",
+                "balance" : "0x0de0b6b3a7606683",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -428,10 +585,10 @@
             }
         }
     },
-    "callcallcode_01_d0g0v0_Homestead" : {
+    "callcallcode_01_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/stCallCodes/callcallcode_01_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -443,9 +600,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "0x8086da65f2e3e889fa3a2e0c48ac813f293b576edc3936069b85b10d25fbb78f",
-                    "mixHash" : "0xe56c40abcda7c8c80b621fedb7e0bcdc4a86a09fc75171b5ed3a2053b3048a19",
-                    "nonce" : "0xfe9d6394e9fd9ddc",
+                    "hash" : "0xd255297c854a758649c785cc929b147dace0115e2137e7d64197e092a1ee2b31",
+                    "mixHash" : "0x774280425abaadc0d608ef17e94d6bde47efcf5ebc73c90c0e618896ba54a175",
+                    "nonce" : "0x569b97b3e47b3c11",
                     "number" : "0x01",
                     "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
                     "receiptTrie" : "0xe51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
@@ -454,7 +611,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0e56c40abcda7c8c80b621fedb7e0bcdc4a86a09fc75171b5ed3a2053b3048a1988fe9d6394e9fd9ddcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0774280425abaadc0d608ef17e94d6bde47efcf5ebc73c90c0e618896ba54a17588569b97b3e47b3c11f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -491,8 +648,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8086da65f2e3e889fa3a2e0c48ac813f293b576edc3936069b85b10d25fbb78f",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd255297c854a758649c785cc929b147dace0115e2137e7d64197e092a1ee2b31",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -571,10 +728,10 @@
             }
         }
     },
-    "callcallcode_01_d0g0v0_Metropolis" : {
+    "callcallcode_01_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/stCallCodes/callcallcode_01_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,19 +742,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03997d",
-                    "hash" : "0xfa4974f9967e4a5aa5c68d0f057d59ec82069d0ce96266d7ab2a2e0109561655",
-                    "mixHash" : "0xce8f9c6a69bac8c8f08d09f6d7bd93990b14fdfad72d1299f91d35f0531c65d9",
-                    "nonce" : "0x0e5f9357d9d7470a",
+                    "gasUsed" : "0x039455",
+                    "hash" : "0xec086fe6d576d6e94a1e6d675b74d6e7cb9d55934c5e5800b5e3d3cb46d5b488",
+                    "mixHash" : "0xd0d8f84177a58497c3f03d841bd34babad9ebdd3ed0857df3eb7e0e27beef516",
+                    "nonce" : "0x9f8e21f774cd8b51",
                     "number" : "0x01",
                     "parentHash" : "0x5ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16",
-                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
-                    "stateRoot" : "0x94728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2",
+                    "receiptTrie" : "0xe51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feee",
+                    "stateRoot" : "0x8c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094728ec6c758d0b2efe13908694f693c2bec783cd1b3409d8294386f4a54c3e2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0ce8f9c6a69bac8c8f08d09f6d7bd93990b14fdfad72d1299f91d35f0531c65d9880e5f9357d9d7470af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05ce994076cf18fa7c4a3dfa72c3afc81fe490ed495c6c9550f03ea3a02cd0a16a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c284cd17b736b213e5e00cdb7ccedb131abacda2bc12e9178c2f760741040d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e51736d11d30f60a4d982e873ff70304a7779922072f5f449b5aa550b5d7feeeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0d0d8f84177a58497c3f03d841bd34babad9ebdd3ed0857df3eb7e0e27beef516889f8e21f774cd8b51f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -634,16 +791,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5caf717f71a3305034460ddabad9c3952a3dc2b25daba81b16cbfe65c2a329ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa4974f9967e4a5aa5c68d0f057d59ec82069d0ce96266d7ab2a2e0109561655",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xec086fe6d576d6e94a1e6d675b74d6e7cb9d55934c5e5800b5e3d3cb46d5b488",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -676,14 +826,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7997d",
+                "balance" : "0x4563918244f79455",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606683",
+                "balance" : "0x0de0b6b3a7606bab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE_d0g0v0.json
index b462c49a2..079ab192e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_OOGE_d0g0v0_EIP150" : {
+    "callcallcodecall_010_OOGE_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/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x2e368e9f94184f98788fef59f4a23bba3ca935585051d53237b2f3f93cd9ecb8",
-                    "mixHash" : "0x05e674869ada7aa2af40a980f726fa0f68e78f62aee5ce0cb87ef51de8a75e92",
-                    "nonce" : "0x5d9d264d41dfa0f1",
+                    "hash" : "0xf55bab563fbdc47945a60f608872026f42eeec449e1aa03a537600181b2beae0",
+                    "mixHash" : "0xb5115c64708ecdcc70e850140b6c79265fece6ad70904a3ee9b56f5fc18bb5f1",
+                    "nonce" : "0x38e609df090c7036",
                     "number" : "0x01",
                     "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "0x5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
-                    "stateRoot" : "0x870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x3c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a005e674869ada7aa2af40a980f726fa0f68e78f62aee5ce0cb87ef51de8a75e92885d9d264d41dfa0f1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0b5115c64708ecdcc70e850140b6c79265fece6ad70904a3ee9b56f5fc18bb5f18838e609df090c7036f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e368e9f94184f98788fef59f4a23bba3ca935585051d53237b2f3f93cd9ecb8",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf55bab563fbdc47945a60f608872026f42eeec449e1aa03a537600181b2beae0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcallcodecall_010_OOGE_d0g0v0_EIP158" : {
+    "callcallcodecall_010_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x402c9ef03e3d30cc61bc37280815a0f077d30f4dc2e86c7a3144b2ae403259a4",
+                    "mixHash" : "0xcd0f36fcca3274222d380fc827446203e9298091b89731bf5371505dfa3e68e9",
+                    "nonce" : "0x945eb4e9bb7fd12f",
+                    "number" : "0x01",
+                    "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x3c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0cd0f36fcca3274222d380fc827446203e9298091b89731bf5371505dfa3e68e988945eb4e9bb7fd12ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x402c9ef03e3d30cc61bc37280815a0f077d30f4dc2e86c7a3144b2ae403259a4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_OOGE_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/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x8c2eaa67fab05e210b91f7f28b11d4d0a15a4c68d88b3b5112d7a9f865dfc147",
-                    "mixHash" : "0x92ae3d66a63342c537da681f101c7150996bda4a5e5f4868c2c49aa1ee3ba521",
-                    "nonce" : "0x28bd766b9c470575",
+                    "hash" : "0x45c5c528a61418f14f16bc35a4857170548a6b1ff2322779d64625a6ca9589ab",
+                    "mixHash" : "0x0867eb938b83e82b538c9ff6f81ec5889eac583734138141f9812937c6d5f927",
+                    "nonce" : "0x58681d1945ca29ad",
                     "number" : "0x01",
                     "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
                     "receiptTrie" : "0x5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a092ae3d66a63342c537da681f101c7150996bda4a5e5f4868c2c49aa1ee3ba5218828bd766b9c470575f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a00867eb938b83e82b538c9ff6f81ec5889eac583734138141f9812937c6d5f9278858681d1945ca29adf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c2eaa67fab05e210b91f7f28b11d4d0a15a4c68d88b3b5112d7a9f865dfc147",
-        "network" : "EIP158",
+        "lastblockhash" : "0x45c5c528a61418f14f16bc35a4857170548a6b1ff2322779d64625a6ca9589ab",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGE_d0g0v0_Frontier" : {
+    "callcallcodecall_010_OOGE_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/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0xf91aa0f5a0fd7dc8c9a5328a7ea5d97ff494315b16d78db0923177450ac8a634",
-                    "mixHash" : "0xa60213ac3d9d3f28864e3836211ef4cdebf0cb229a46c48550d0e8794d92df2a",
-                    "nonce" : "0x7f86f76265878865",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x4d9ccfa20dce37daad2225a762d86436a34e3ae52a333463acc44eb43b86df47",
+                    "mixHash" : "0x3edacc3284850e774fff6b73b487e0d5e185dd6843fe80566fe7ee2dbda3ded8",
+                    "nonce" : "0x61bb4d76f5a8e133",
                     "number" : "0x01",
                     "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "0xa849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
-                    "stateRoot" : "0x7581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6",
+                    "receiptTrie" : "0x5c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4d",
+                    "stateRoot" : "0x870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0a60213ac3d9d3f28864e3836211ef4cdebf0cb229a46c48550d0e8794d92df2a887f86f76265878865f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0870ea7301483aeb95fc534a48560aa5128a31c8bac14f1e0f666f2ebe3690c07a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05c552db242198a94a9486845bab75b886c74d2a7bda4e54946c2660eb7fa8a4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a03edacc3284850e774fff6b73b487e0d5e185dd6843fe80566fe7ee2dbda3ded88861bb4d76f5a8e133f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf91aa0f5a0fd7dc8c9a5328a7ea5d97ff494315b16d78db0923177450ac8a634",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4d9ccfa20dce37daad2225a762d86436a34e3ae52a333463acc44eb43b86df47",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGE_d0g0v0_Homestead" : {
+    "callcallcodecall_010_OOGE_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/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0x001ce3f49603827ae14e71f11b50f01f283236234948102a2a17324e822df0c9",
-                    "mixHash" : "0x3ea2e47f161a9fbf9e30a850dd9da0a46cc75d4c081a890085a03e5b0d6924c6",
-                    "nonce" : "0xcd174559a92324eb",
+                    "hash" : "0x214ab64bd9fa00c043e5ccc85255aa6e260951f4eae0cb7055b86e77f3fa5deb",
+                    "mixHash" : "0x90fd2bc4b165dc407d392a062a19e5c568244d91c3396406427d62e530bea25d",
+                    "nonce" : "0x6937d23e20bb1531",
                     "number" : "0x01",
                     "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
                     "receiptTrie" : "0xa849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a03ea2e47f161a9fbf9e30a850dd9da0a46cc75d4c081a890085a03e5b0d6924c688cd174559a92324ebf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a090fd2bc4b165dc407d392a062a19e5c568244d91c3396406427d62e530bea25d886937d23e20bb1531f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x001ce3f49603827ae14e71f11b50f01f283236234948102a2a17324e822df0c9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x214ab64bd9fa00c043e5ccc85255aa6e260951f4eae0cb7055b86e77f3fa5deb",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGE_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_OOGE_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/stCallCodes/callcallcodecall_010_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0x62c08c6428dc49e36e7b9780fb797c2b1d172f7a9b7df8926febfee8cf918081",
-                    "mixHash" : "0x6b15a50c69fe81b8ac7f5a12379b6a6991b21f5e5893486d3188714ecf1c55c8",
-                    "nonce" : "0x8b98b05d0a7bf1ce",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0x65835838ecd05dc182df9e4cb615138a81d14e3229e529848567523660398fa2",
+                    "mixHash" : "0x920316bb7259f407c20320474db1b49043de40c702a6fdce377deaa9715632c7",
+                    "nonce" : "0x8e32e04a88a83b56",
                     "number" : "0x01",
                     "parentHash" : "0x626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0x3c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29a",
+                    "receiptTrie" : "0xa849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584",
+                    "stateRoot" : "0x7581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c389cab5b68f770eae7636dbfee320f18019f80d208fffd264ab75d3494a29aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a06b15a50c69fe81b8ac7f5a12379b6a6991b21f5e5893486d3188714ecf1c55c8888b98b05d0a7bf1cef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0626b2da98e6eb7285c74c705da1ce2d6c1c5c900bc475d9935610b417b2c30a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07581382fc20ed6c26b1bde11309b50347ac6e0d73c4dc617779047d91de826b6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a849827dc4664953c38ce117b0776f57aae6657707eaebc31b39eee67ea04584b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0920316bb7259f407c20320474db1b49043de40c702a6fdce377deaa9715632c7888e32e04a88a83b56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe3f36886604a53a4984989b217801518ab579d82eaf7a37cc50949b7f2631d8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62c08c6428dc49e36e7b9780fb797c2b1d172f7a9b7df8926febfee8cf918081",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x65835838ecd05dc182df9e4cb615138a81d14e3229e529848567523660398fa2",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0.json
index 077bc0df9..d08a9c304 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_OOGMAfter_d0g0v0_EIP150" : {
+    "callcallcodecall_010_OOGMAfter_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/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x885d3f9b506bcea343ba412c6b64d06583cc055e377a4b2ae5b1dd5e98c4500a",
-                    "mixHash" : "0xbec25ff51b283183ca1973fc6de85f92c9d2f5939e8c7a84a83819594713d120",
-                    "nonce" : "0x1d8dec6cd0bf98a2",
+                    "hash" : "0x4405682fd9af39b35ec898f0bd59e6d92ecea5f6d3aa9fa3668b5adb06fa64db",
+                    "mixHash" : "0x76ea3a40b4822b48df2a7b5fb17b8fc79debe54e6e4bc400dbdae68c2332eac9",
+                    "nonce" : "0x2c7ce3223e1e95ee",
                     "number" : "0x01",
                     "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
-                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xa02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0bec25ff51b283183ca1973fc6de85f92c9d2f5939e8c7a84a83819594713d120881d8dec6cd0bf98a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a076ea3a40b4822b48df2a7b5fb17b8fc79debe54e6e4bc400dbdae68c2332eac9882c7ce3223e1e95eef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x885d3f9b506bcea343ba412c6b64d06583cc055e377a4b2ae5b1dd5e98c4500a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4405682fd9af39b35ec898f0bd59e6d92ecea5f6d3aa9fa3668b5adb06fa64db",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_d0g0v0_EIP158" : {
+    "callcallcodecall_010_OOGMAfter_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/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xbcce699e0952782d241131d3cd935ecab3cb5a62361b2e381bea4f90268e1a63",
-                    "mixHash" : "0xdf7565bc1c5d9c8656713b226c7431c0173b14825f28a376cd1838e3d7fd0c38",
-                    "nonce" : "0x64d75a1bf4027863",
+                    "hash" : "0xbf1f0a605e15a42ca88be63d8211253bec5c16a8a3cd2238bfd89a2a1a5700f9",
+                    "mixHash" : "0x12a02b81a00c587ed920ab1c3a9b9f9e83b1657283a224915182171cc36f5c67",
+                    "nonce" : "0x03f66c7104cbae0c",
+                    "number" : "0x01",
+                    "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xa02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a012a02b81a00c587ed920ab1c3a9b9f9e83b1657283a224915182171cc36f5c678803f66c7104cbae0cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf1f0a605e15a42ca88be63d8211253bec5c16a8a3cd2238bfd89a2a1a5700f9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x8d3539c83fafd2eb069082d6fbadb2fb78e0c16c2c0345d6e833211b3475560d",
+                    "mixHash" : "0xb40255a669cd860e46f35337745684d18313f5176c34e8322d6a448a1b80c0fe",
+                    "nonce" : "0xef272bf53a0615f5",
                     "number" : "0x01",
                     "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
                     "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0df7565bc1c5d9c8656713b226c7431c0173b14825f28a376cd1838e3d7fd0c388864d75a1bf4027863f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0b40255a669cd860e46f35337745684d18313f5176c34e8322d6a448a1b80c0fe88ef272bf53a0615f5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcce699e0952782d241131d3cd935ecab3cb5a62361b2e381bea4f90268e1a63",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8d3539c83fafd2eb069082d6fbadb2fb78e0c16c2c0345d6e833211b3475560d",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_d0g0v0_Frontier" : {
+    "callcallcodecall_010_OOGMAfter_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/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x44812777d62bbe074bda915ba7cb7a9e3b43f4213e5fd969f78749dd596ba380",
-                    "mixHash" : "0x4bc8c1c56df84b9e587ddeaf543e45945e7d54e98ff8c5f5d9a70ad537213571",
-                    "nonce" : "0x83b3910266cd3c67",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x9c916688ae0117a74c234636b34cf7753b816cd5326197512792b0e737e5a86d",
+                    "mixHash" : "0x1252bc2faa4228fc293618a1edf76436009e943f06fb15aeb3056ae385e7238a",
+                    "nonce" : "0x9ff96deab188eee7",
                     "number" : "0x01",
                     "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
-                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
+                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
+                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a04bc8c1c56df84b9e587ddeaf543e45945e7d54e98ff8c5f5d9a70ad5372135718883b3910266cd3c67f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a01252bc2faa4228fc293618a1edf76436009e943f06fb15aeb3056ae385e7238a889ff96deab188eee7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44812777d62bbe074bda915ba7cb7a9e3b43f4213e5fd969f78749dd596ba380",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9c916688ae0117a74c234636b34cf7753b816cd5326197512792b0e737e5a86d",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_d0g0v0_Homestead" : {
+    "callcallcodecall_010_OOGMAfter_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/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xe7937288a28bee15cb76da6f74ac4b08f40298b1c1bc07e4cb653f96562f4f7a",
-                    "mixHash" : "0xe0848db4ed6c0f9f8227dfb75d30a6e96c3b711de4f5a87bf889ea7f812e71ee",
-                    "nonce" : "0x3582f8a9f90511c3",
+                    "hash" : "0x6b82d186b608ea7a2698e0ffbbaae80804aad2ced2761588630e4a871113798b",
+                    "mixHash" : "0x4716b8c9883ee50e6f68f092468d377623cf832d685805332dd9a5f1d7962bdb",
+                    "nonce" : "0xfe758f679be1e6a5",
                     "number" : "0x01",
                     "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
                     "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0e0848db4ed6c0f9f8227dfb75d30a6e96c3b711de4f5a87bf889ea7f812e71ee883582f8a9f90511c3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a04716b8c9883ee50e6f68f092468d377623cf832d685805332dd9a5f1d7962bdb88fe758f679be1e6a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7937288a28bee15cb76da6f74ac4b08f40298b1c1bc07e4cb653f96562f4f7a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6b82d186b608ea7a2698e0ffbbaae80804aad2ced2761588630e4a871113798b",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_OOGMAfter_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/stCallCodes/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xc16c20362b0edaa26ebad11c0ba3f6a6fd09dd82bd7019237228f7dbadf07dd1",
-                    "mixHash" : "0xa68cb913c5b5a7e5d43007ac4dfc6b115168d7452f7c0e82489a8e8b2926a992",
-                    "nonce" : "0x86b7c9c733f3f0fc",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x00ca0e2fb16790c07b54872fc054064c1163441593d8a38961b15ab93d29966e",
+                    "mixHash" : "0xbc7736097a700894143f44a178c143627a1713cc4949403937d6311a56cadb23",
+                    "nonce" : "0x46786516869a0d66",
                     "number" : "0x01",
                     "parentHash" : "0x0c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0xa02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99",
+                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
+                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0a68cb913c5b5a7e5d43007ac4dfc6b115168d7452f7c0e82489a8e8b2926a9928886b7c9c733f3f0fcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00c8e07e3dedee0103c8a3613f9f31a05ebe8f9c62772dedea07cfe14bd5890c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0bc7736097a700894143f44a178c143627a1713cc4949403937d6311a56cadb238846786516869a0d66f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc16c20362b0edaa26ebad11c0ba3f6a6fd09dd82bd7019237228f7dbadf07dd1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x00ca0e2fb16790c07b54872fc054064c1163441593d8a38961b15ab93d29966e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0.json
index be50c1192..dd5b1d55e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_OOGMBefore_d0g0v0_EIP150" : {
+    "callcallcodecall_010_OOGMBefore_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/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x7f9d52392e4662d280f5c3b1262bed595b1a554c7138bb0bac209ce128fea3fc",
-                    "mixHash" : "0x7931684c7cff2da976a4347a44422ab7209327a8951442ee7ffa17dfb22574b2",
-                    "nonce" : "0x5b8aaaa432db315d",
+                    "hash" : "0xaef0c434f218b9f2665bdca35c740fb908cf9e5c97ee4c65c88227ec3798dd16",
+                    "mixHash" : "0x517eacc04530b07bc34bf644b75fd8b3a126aac23fb1d3274542ad60f4e9b127",
+                    "nonce" : "0x8b7b85e08e1f9afa",
                     "number" : "0x01",
                     "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "0x505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
-                    "stateRoot" : "0x83ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adf",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x30ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a07931684c7cff2da976a4347a44422ab7209327a8951442ee7ffa17dfb22574b2885b8aaaa432db315df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa030ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0517eacc04530b07bc34bf644b75fd8b3a126aac23fb1d3274542ad60f4e9b127888b7b85e08e1f9afaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7f9d52392e4662d280f5c3b1262bed595b1a554c7138bb0bac209ce128fea3fc",
-        "network" : "EIP150",
+        "lastblockhash" : "0xaef0c434f218b9f2665bdca35c740fb908cf9e5c97ee4c65c88227ec3798dd16",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMBefore_d0g0v0_EIP158" : {
+    "callcallcodecall_010_OOGMBefore_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/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xeab99c25eff2abf867bba97b505d5d71fe6318f2154c701df2046e559f045270",
-                    "mixHash" : "0x6bf6292df0d664a447ffc6a42aabdcef6b7c5ad3b1b237617ee78191bf656941",
-                    "nonce" : "0xe610c08e11260853",
+                    "hash" : "0x946854e56f2af0de9766a57041f63fe5fc233d04143c8a1608d50ce59656b24e",
+                    "mixHash" : "0x15c96e84c198e6432c8256e8f7ae7f21c2d3b81669fce42aad3ac6249794f391",
+                    "nonce" : "0xc6f2a3ab2f7bed79",
+                    "number" : "0x01",
+                    "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x30ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa030ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a015c96e84c198e6432c8256e8f7ae7f21c2d3b81669fce42aad3ac6249794f39188c6f2a3ab2f7bed79f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8ee",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x946854e56f2af0de9766a57041f63fe5fc233d04143c8a1608d50ce59656b24e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x00f66035ae8bd8f9ff791cacb3581347759862fab63cbf95f95c695d99745af7",
+                    "mixHash" : "0xd01fa647419ec712ad8e7497bb57211359af9f31c4da86186130abe0c28d9f83",
+                    "nonce" : "0x793b904aea9c68cf",
                     "number" : "0x01",
                     "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
                     "receiptTrie" : "0x505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a06bf6292df0d664a447ffc6a42aabdcef6b7c5ad3b1b237617ee78191bf65694188e610c08e11260853f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0d01fa647419ec712ad8e7497bb57211359af9f31c4da86186130abe0c28d9f8388793b904aea9c68cff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeab99c25eff2abf867bba97b505d5d71fe6318f2154c701df2046e559f045270",
-        "network" : "EIP158",
+        "lastblockhash" : "0x00f66035ae8bd8f9ff791cacb3581347759862fab63cbf95f95c695d99745af7",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMBefore_d0g0v0_Frontier" : {
+    "callcallcodecall_010_OOGMBefore_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/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x962fe49fd32ec2b1f9c6039f082f8b775cf9a0e08eb9ddb3dd7f6e0e73d83be2",
-                    "mixHash" : "0x1f4733d2675d015126da3e2da62c0273735c229d923a28f1f34f35c308071d85",
-                    "nonce" : "0x63415472abd65b9c",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x23e1b7d2a28e7d13cf94c69c301c0b7849069eeaf82ff810362464fab12bff6f",
+                    "mixHash" : "0xb9f7e07995bfd68c6f8f802e8213e2dd755a723e98fff1e9660a02f181dbe7e3",
+                    "nonce" : "0x41f5ec1d3a50dab2",
                     "number" : "0x01",
                     "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "0x6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
-                    "stateRoot" : "0x8a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245",
+                    "receiptTrie" : "0x505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2",
+                    "stateRoot" : "0x83ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01f4733d2675d015126da3e2da62c0273735c229d923a28f1f34f35c308071d858863415472abd65b9cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083ed91519b70dec0ac890c6d3595e6f18184cc474a737a9966e0917f70ac6adfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0505b68e1517a8046140524830ef7b1e3d31d0bea31437fcbf4a95fe9613b4dd2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0b9f7e07995bfd68c6f8f802e8213e2dd755a723e98fff1e9660a02f181dbe7e38841f5ec1d3a50dab2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x962fe49fd32ec2b1f9c6039f082f8b775cf9a0e08eb9ddb3dd7f6e0e73d83be2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x23e1b7d2a28e7d13cf94c69c301c0b7849069eeaf82ff810362464fab12bff6f",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMBefore_d0g0v0_Homestead" : {
+    "callcallcodecall_010_OOGMBefore_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/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x85a802c5a9f412dcfad00417e6495bb8d884395b970403e5d75b61fe3843fde1",
-                    "mixHash" : "0xafb4e0c694bd829dfecc81e15b0379a17019c06c91ca162fb5f5c43db53821f1",
-                    "nonce" : "0xa73e8fe852fb4b70",
+                    "hash" : "0x15b2d9342bb5d9c53a283fda82f2cd86ee7a112125ffdc40a630fc27018c3485",
+                    "mixHash" : "0x9ced21ccd63db16f78d3cfbd5db2e8b320cb15c42761c932ebc5ddb63e4f0faf",
+                    "nonce" : "0xe542e2ef2e385f49",
                     "number" : "0x01",
                     "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
                     "receiptTrie" : "0x6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0afb4e0c694bd829dfecc81e15b0379a17019c06c91ca162fb5f5c43db53821f188a73e8fe852fb4b70f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a09ced21ccd63db16f78d3cfbd5db2e8b320cb15c42761c932ebc5ddb63e4f0faf88e542e2ef2e385f49f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85a802c5a9f412dcfad00417e6495bb8d884395b970403e5d75b61fe3843fde1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x15b2d9342bb5d9c53a283fda82f2cd86ee7a112125ffdc40a630fc27018c3485",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_OOGMBefore_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/stCallCodes/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0xab4095a7a97d9c669069dde4f4966c3e1d5e31113fcbd6083c935435bd16d19b",
-                    "mixHash" : "0x8f76c95eccb00144b3e8ab6f99cea9dc01897d600abe1521d4f0e09ab46be29a",
-                    "nonce" : "0xc821009ba61fcd60",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x4ab271053923760e9787064e8b2ff35322e4d3d18336983c33d27e64d68f0c21",
+                    "mixHash" : "0x2654ba4c2537a3e0ef3cc8ff74de47ee80e716af89a65159dac37a23075e6178",
+                    "nonce" : "0x5d0b5330a37ced51",
                     "number" : "0x01",
                     "parentHash" : "0x0366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8b",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0x30ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94",
+                    "receiptTrie" : "0x6d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9",
+                    "stateRoot" : "0x8a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa030ada0ad3b390eea8cd1b1d4fef4dd2200f7bb2f29d4b278077a6e047bb61d94a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08f76c95eccb00144b3e8ab6f99cea9dc01897d600abe1521d4f0e09ab46be29a88c821009ba61fcd60f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00366d5d7b796aca4424342fb38dfe032c32dacecf563e4ccd8f02ede68fa4e8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a74bccfa35498e42eddc57b46c4f822b3f1d52fdf669adfa44954e69bbad245a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d101b9208ce917beba2bb8ee40accd7dba5fb33a968ece3a1a40ac8f92f0cb9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a02654ba4c2537a3e0ef3cc8ff74de47ee80e716af89a65159dac37a23075e6178885d0b5330a37ced51f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0250bd9f5f4dc4c34cb9e321a213a909f3b6b68cdee23c1d9866074a3ce87d8eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab4095a7a97d9c669069dde4f4966c3e1d5e31113fcbd6083c935435bd16d19b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4ab271053923760e9787064e8b2ff35322e4d3d18336983c33d27e64d68f0c21",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0.json
index d781bffa9..f8cf6d2c3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_SuicideEnd_d0g0v0_EIP150" : {
+    "callcallcodecall_010_SuicideEnd_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/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x5c0bab4164d7abf70d93cfbacdcf34cca7ab0c0ae62db1d79ce40194ef1107ef",
-                    "mixHash" : "0xb73841ed3eaaf089a576ce9fc3ee64c54441e3c7adb332eba01755ba1e234107",
-                    "nonce" : "0xbd21a2b70a67f373",
+                    "hash" : "0x62617af575fcf5fbb87f7bf5fc0d7af7dc92e612e376f1a74186391299363b0c",
+                    "mixHash" : "0x4d36a877becee3c646bf0a14301a3afe030100f8adb43aabce7459654a2974ca",
+                    "nonce" : "0x007ec55d224d4daf",
                     "number" : "0x01",
                     "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "0x5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
-                    "stateRoot" : "0xa04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xe6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0b73841ed3eaaf089a576ce9fc3ee64c54441e3c7adb332eba01755ba1e23410788bd21a2b70a67f373f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a04d36a877becee3c646bf0a14301a3afe030100f8adb43aabce7459654a2974ca88007ec55d224d4daff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c0bab4164d7abf70d93cfbacdcf34cca7ab0c0ae62db1d79ce40194ef1107ef",
-        "network" : "EIP150",
+        "lastblockhash" : "0x62617af575fcf5fbb87f7bf5fc0d7af7dc92e612e376f1a74186391299363b0c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideEnd_d0g0v0_EIP158" : {
+    "callcallcodecall_010_SuicideEnd_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/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xedc352d2d4405b7f4a634157de4c551a5f4f146024c688ab875aa1d93863d43c",
-                    "mixHash" : "0x428918992263e558a44be46995004bc490b0b101438809734f7b87681e4d7e1b",
-                    "nonce" : "0xdac07b3535c13ed7",
+                    "hash" : "0x0de4df2de85fce816d6de2c77d2c0c18c86c4dfb7ba256c47380da6f1902d150",
+                    "mixHash" : "0x282ec2ef5b4f561502175a28660543a2148722e2b5f4ca932f18f1e8aa276e46",
+                    "nonce" : "0x6c3bc01e26225e49",
+                    "number" : "0x01",
+                    "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xe6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0282ec2ef5b4f561502175a28660543a2148722e2b5f4ca932f18f1e8aa276e46886c3bc01e26225e49f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925af",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0de4df2de85fce816d6de2c77d2c0c18c86c4dfb7ba256c47380da6f1902d150",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0xec2b325e3a017bdb1afd75b4b9508352158917d932c76586c3675e901f32e79c",
+                    "mixHash" : "0xee089fd87ed29e08b9a2e70b007fe8a6ad6bb58a36e22a6aef12eb62455934ce",
+                    "nonce" : "0xc742975b5c3aa773",
                     "number" : "0x01",
                     "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
                     "receiptTrie" : "0x5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0428918992263e558a44be46995004bc490b0b101438809734f7b87681e4d7e1b88dac07b3535c13ed7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0ee089fd87ed29e08b9a2e70b007fe8a6ad6bb58a36e22a6aef12eb62455934ce88c742975b5c3aa773f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedc352d2d4405b7f4a634157de4c551a5f4f146024c688ab875aa1d93863d43c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xec2b325e3a017bdb1afd75b4b9508352158917d932c76586c3675e901f32e79c",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideEnd_d0g0v0_Frontier" : {
+    "callcallcodecall_010_SuicideEnd_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/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0xa0993c1d12fa2a74d5dad2273bd9df02c91474d6fe5924f5210fff1ca5e4f745",
-                    "mixHash" : "0xd8c8e0f47715a68adef3fb2ebc1bb1df985ea591223f45407133d00a9b13821c",
-                    "nonce" : "0xfb0336b34deb28f8",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x6112eddf7d3a5bbabb5c55b667438c11bc6ddf789c728fe683ade62eebce8bbd",
+                    "mixHash" : "0x603c0315218d382f2b1e5661876ba2394e8087f4ab2caaa327b428ea3e4b3c63",
+                    "nonce" : "0xd733e072c0b248dd",
                     "number" : "0x01",
                     "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "0xd0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
-                    "stateRoot" : "0x502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498",
+                    "receiptTrie" : "0x5ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fde",
+                    "stateRoot" : "0xa04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d8c8e0f47715a68adef3fb2ebc1bb1df985ea591223f45407133d00a9b13821c88fb0336b34deb28f8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a04a7bf5b8fc73a6cafc6ca76c47870966136a13e8ecc2289a0fb546fbc3a204a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ddf1b8d5475614bd8beb33dd7cb335730a4aa379ebaa01771ff2f9643ed7fdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0603c0315218d382f2b1e5661876ba2394e8087f4ab2caaa327b428ea3e4b3c6388d733e072c0b248ddf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0993c1d12fa2a74d5dad2273bd9df02c91474d6fe5924f5210fff1ca5e4f745",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6112eddf7d3a5bbabb5c55b667438c11bc6ddf789c728fe683ade62eebce8bbd",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideEnd_d0g0v0_Homestead" : {
+    "callcallcodecall_010_SuicideEnd_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/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0x1626362fea28b6a395d3dda2e5fcb4e188d659ce27b674974bdb0d005f5ee3c2",
-                    "mixHash" : "0x162bdc86aa373a3abd9dfd7f3fcaa0de338a4619a02c344cee04b13ec38f0f32",
-                    "nonce" : "0x70624fa84ccb5fad",
+                    "hash" : "0xdc6077d692967a6f3b68b56d7eef79d0ca0c281026f9cdedfb91a357276c0548",
+                    "mixHash" : "0x358632eba5b618696a6a5fee754c0de805a0e2631f2c4eab2967ea9cca493fa2",
+                    "nonce" : "0x4688f141c9c103ce",
                     "number" : "0x01",
                     "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
                     "receiptTrie" : "0xd0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0162bdc86aa373a3abd9dfd7f3fcaa0de338a4619a02c344cee04b13ec38f0f328870624fa84ccb5fadf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0358632eba5b618696a6a5fee754c0de805a0e2631f2c4eab2967ea9cca493fa2884688f141c9c103cef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1626362fea28b6a395d3dda2e5fcb4e188d659ce27b674974bdb0d005f5ee3c2",
-        "network" : "Homestead",
+        "lastblockhash" : "0xdc6077d692967a6f3b68b56d7eef79d0ca0c281026f9cdedfb91a357276c0548",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_SuicideEnd_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/stCallCodes/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x4c6ff75b1c08c122c6efe57d4d30b5922b98e37ae0e1c66e77a74126ca68f9ce",
-                    "mixHash" : "0x09f4808624f0dce2ec51873f0bf6f497bc6dbc3817fc670988914f2d2d4baac4",
-                    "nonce" : "0xb2f75c41482fdb26",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0x5a543727cbca36efd51bce5fb94d0b068ead94a1cd4c406b8da752080f0705e4",
+                    "mixHash" : "0x76658cf9b2c695014b0c2228a5f632116b8b229d476e66a6c6929ebd048bec31",
+                    "nonce" : "0x5cb4845e58fc5855",
                     "number" : "0x01",
                     "parentHash" : "0x3dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6e",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0xe6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519",
+                    "receiptTrie" : "0xd0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37c",
+                    "stateRoot" : "0x502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6db8e9be16198fd595e06ba781853f0879ffc1cf4ebff4ac85b7fc1742fc519a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a009f4808624f0dce2ec51873f0bf6f497bc6dbc3817fc670988914f2d2d4baac488b2f75c41482fdb26f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03dfbb7cf1e97cd750608ce206ae03f10eb75bd22a598e550de7f04aeb1141b6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502bf863134ad7c068442765a3d5dd072efd0ff3ab8c92267fcc580640ce8498a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d0894e5a5b418948c955033acb4a3a4c93d7e9afebff28fee033f0e632e3f37cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a076658cf9b2c695014b0c2228a5f632116b8b229d476e66a6c6929ebd048bec31885cb4845e58fc5855f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8b0db9be9e338f626cb9eb9edbf5ea808e5bdf4d6ada0f7799d3799e04925afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c6ff75b1c08c122c6efe57d4d30b5922b98e37ae0e1c66e77a74126ca68f9ce",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5a543727cbca36efd51bce5fb94d0b068ead94a1cd4c406b8da752080f0705e4",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
index 805415f8e..44c567be3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcallcodecall_010_SuicideMiddle_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/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xe26f795191a37b6f2fbfbea6d7f739f6edb7337fcbc42e1b40a8dedb5b41c8c6",
-                    "mixHash" : "0xdd4d138feaf240bf55dcc8b3d47005e2d267f4b54276f49fdf532a79f2012ee1",
-                    "nonce" : "0x1aabcc53e10596d9",
+                    "hash" : "0x4cbbcc1afe9cdefa3ca7ee97be0e206c9f36f193376b3199b01a014bec35b427",
+                    "mixHash" : "0xd3d61598bc74462ddc770433e6cb90b30b70580a734faea8529ddd556b19aa5f",
+                    "nonce" : "0xbdff2ffce2bb8699",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
-                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0dd4d138feaf240bf55dcc8b3d47005e2d267f4b54276f49fdf532a79f2012ee1881aabcc53e10596d9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d3d61598bc74462ddc770433e6cb90b30b70580a734faea8529ddd556b19aa5f88bdff2ffce2bb8699f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe26f795191a37b6f2fbfbea6d7f739f6edb7337fcbc42e1b40a8dedb5b41c8c6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4cbbcc1afe9cdefa3ca7ee97be0e206c9f36f193376b3199b01a014bec35b427",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -140,10 +147,158 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcallcodecall_010_SuicideMiddle_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xcb3c1e6f5616fcd943eb3117cf592947b85fa413eaf23791c99a905f855840f1",
+                    "mixHash" : "0xf13593c25ad429ef8551205c42e2dac17c06370535bcfc6b079801ef28b787e1",
+                    "nonce" : "0x62548113dbb4803b",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f13593c25ad429ef8551205c42e2dac17c06370535bcfc6b079801ef28b787e18862548113dbb4803bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb3c1e6f5616fcd943eb3117cf592947b85fa413eaf23791c99a905f855840f1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_SuicideMiddle_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/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -155,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x5a7e4d51f9a76ddfbeac5d6c4b5fe2b7d24f2565191321103c19680839bb6d7a",
-                    "mixHash" : "0x2ff381fe302386ca42013f28c719c2fc03537676deff999504dc7386daf942fa",
-                    "nonce" : "0x2606e77b22ebaab4",
+                    "hash" : "0x63c660789be1df81bec9c0d9ebced4eb44e6832e0eefbc90cb89401f378fd96e",
+                    "mixHash" : "0x360ba1cfa50fddd000d5728a47ca3861e309769ea507bdf9ef34c42e243bd1eb",
+                    "nonce" : "0x58354e821096e4dd",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
                     "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
@@ -166,7 +321,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a02ff381fe302386ca42013f28c719c2fc03537676deff999504dc7386daf942fa882606e77b22ebaab4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0360ba1cfa50fddd000d5728a47ca3861e309769ea507bdf9ef34c42e243bd1eb8858354e821096e4ddf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -203,8 +358,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a7e4d51f9a76ddfbeac5d6c4b5fe2b7d24f2565191321103c19680839bb6d7a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x63c660789be1df81bec9c0d9ebced4eb44e6832e0eefbc90cb89401f378fd96e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -281,10 +436,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcallcodecall_010_SuicideMiddle_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/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -295,19 +450,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0x2bb3104438b3f084c360a0157cd888df0d2abc97ebdb249e42cb2b019b70572b",
-                    "mixHash" : "0x12f1e511e0d978c300c771188102673b2fdfe8571c3a6b8cb07e60b1bad06996",
-                    "nonce" : "0x66f9d4ed40e8ddaf",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xdff67528fdb83d5b5f9af40d731c669e9a67cc59d5288b578990cbe4c5d5baca",
+                    "mixHash" : "0xbdd9276ee9d5ce4e08f7bc4e23b74a125559f25b170074010236688579115e80",
+                    "nonce" : "0x1ceaaf3b744a5006",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
-                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a012f1e511e0d978c300c771188102673b2fdfe8571c3a6b8cb07e60b1bad069968866f9d4ed40e8ddaff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bdd9276ee9d5ce4e08f7bc4e23b74a125559f25b170074010236688579115e80881ceaaf3b744a5006f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,8 +499,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bb3104438b3f084c360a0157cd888df0d2abc97ebdb249e42cb2b019b70572b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdff67528fdb83d5b5f9af40d731c669e9a67cc59d5288b578990cbe4c5d5baca",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -370,14 +525,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -422,10 +577,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcallcodecall_010_SuicideMiddle_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/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,9 +592,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x09b20cccb302f45fb9403f8377643554ef1e31d25b7472d8489df09bd3a78e89",
-                    "mixHash" : "0xc0ab53333aeab9fcf1086e1f23544f3409fc59f10354529543a9d50ce700c5e9",
-                    "nonce" : "0x25797daf38250b9a",
+                    "hash" : "0xbfa9fb15e7d77e32b7188216041dbc468d61e549359a8ca56c9bc528b5fe3cf0",
+                    "mixHash" : "0x1ae047acd2ea8c9ec0e46d2fbb588641b4830401ba14b2d9022004bc3ab49780",
+                    "nonce" : "0xdfa54dab5f34a31d",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
                     "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
@@ -448,7 +603,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c0ab53333aeab9fcf1086e1f23544f3409fc59f10354529543a9d50ce700c5e98825797daf38250b9af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a01ae047acd2ea8c9ec0e46d2fbb588641b4830401ba14b2d9022004bc3ab4978088dfa54dab5f34a31df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -485,8 +640,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09b20cccb302f45fb9403f8377643554ef1e31d25b7472d8489df09bd3a78e89",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbfa9fb15e7d77e32b7188216041dbc468d61e549359a8ca56c9bc528b5fe3cf0",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -563,10 +718,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_SuicideMiddle_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/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -577,19 +732,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0xc7ce3ac74d407507a64473e1d82a0ca4c7cd19d98383aded5d6812ee2cec85b7",
-                    "mixHash" : "0xd898bed68f99dc1e667491065e08ac7ab3236ac11f7b5177822c941dc7711a65",
-                    "nonce" : "0x42ca72599576aa4b",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xb11dda70ebf5186fa89e26338fc81d28160ce8cd14787d5038dd980cd730f255",
+                    "mixHash" : "0x955225148775d91f989ca7fbac98a62cfefd0a03c8e93a5c504bd64fbeb63fc1",
+                    "nonce" : "0x3e86297abf7065b6",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d898bed68f99dc1e667491065e08ac7ab3236ac11f7b5177822c941dc7711a658842ca72599576aa4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0955225148775d91f989ca7fbac98a62cfefd0a03c8e93a5c504bd64fbeb63fc1883e86297abf7065b6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,16 +781,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7ce3ac74d407507a64473e1d82a0ca4c7cd19d98383aded5d6812ee2cec85b7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb11dda70ebf5186fa89e26338fc81d28160ce8cd14787d5038dd980cd730f255",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -659,14 +807,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_d0g0v0.json
index 581a3bece..b301c2875 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_d0g0v0_EIP150" : {
+    "callcallcodecall_010_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/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xa557b8f863178ddd0d3e53a53f58b3b5e0ba58cb384f0e7d008d808a7650a686",
-                    "mixHash" : "0xc7a57b5a288351ea4be4f5044cbc92c6f5831ea659d703789ede2b9dc1802917",
-                    "nonce" : "0x7eedc01144ba61e5",
+                    "hash" : "0x619630ab9d0b6ace34d579379a846a1013308e5d52fec248b139c212927018d5",
+                    "mixHash" : "0x10e5f870f747195f38104a8c402435709489029263314a991b2ec5c9ff3fd1b1",
+                    "nonce" : "0x8dca2f2343be292c",
                     "number" : "0x01",
                     "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "0x263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
-                    "stateRoot" : "0x698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x75a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c7a57b5a288351ea4be4f5044cbc92c6f5831ea659d703789ede2b9dc1802917887eedc01144ba61e5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a010e5f870f747195f38104a8c402435709489029263314a991b2ec5c9ff3fd1b1888dca2f2343be292cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa557b8f863178ddd0d3e53a53f58b3b5e0ba58cb384f0e7d008d808a7650a686",
-        "network" : "EIP150",
+        "lastblockhash" : "0x619630ab9d0b6ace34d579379a846a1013308e5d52fec248b139c212927018d5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcallcodecall_010_d0g0v0_EIP158" : {
+    "callcallcodecall_010_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/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x0aaccc8d008150deed8c1ab8765d6d29ff0bd72a970be72564eb6887959b2f75",
-                    "mixHash" : "0xa3852889d02ae5f646b23dc25bbc2698564ed53c21880a9e8a8e1021dd65c02a",
-                    "nonce" : "0x0a87e2726d13739f",
+                    "hash" : "0x4fe78faff1cdb0a7c837fcc166e13ce9da379e4ad5fe45aa9e4ee90513471e48",
+                    "mixHash" : "0x3badc510e33c22b266906c87bd4ed1b9515e0702933b531633898d9c4635d272",
+                    "nonce" : "0x7ad7cf008f276fa3",
+                    "number" : "0x01",
+                    "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x75a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a03badc510e33c22b266906c87bd4ed1b9515e0702933b531633898d9c4635d272887ad7cf008f276fa3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95ce",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4fe78faff1cdb0a7c837fcc166e13ce9da379e4ad5fe45aa9e4ee90513471e48",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a763fffe",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x03",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x014a" : "0x1000000000000000000000000000000000000003",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000001",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x2c6d310a7020dadec3446ece698dc0fd81eabcec0caba6a700e055984af0bd43",
+                    "mixHash" : "0xdc4404db56af0c3fa9128d293a841c7784dc9b78660c85ab55506a63f087950d",
+                    "nonce" : "0x4cb39dcd0219d4ee",
                     "number" : "0x01",
                     "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
                     "receiptTrie" : "0x263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0a3852889d02ae5f646b23dc25bbc2698564ed53c21880a9e8a8e1021dd65c02a880a87e2726d13739ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0dc4404db56af0c3fa9128d293a841c7784dc9b78660c85ab55506a63f087950d884cb39dcd0219d4eef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0aaccc8d008150deed8c1ab8765d6d29ff0bd72a970be72564eb6887959b2f75",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2c6d310a7020dadec3446ece698dc0fd81eabcec0caba6a700e055984af0bd43",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcallcodecall_010_d0g0v0_Frontier" : {
+    "callcallcodecall_010_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/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0xac7d3665c56063de8a7e69108cb5913448bbb124a7ec5d3bdb8abf02cdbe772b",
-                    "mixHash" : "0xa94de744aa2ca75920f462f8cda2f8a4b79d3d8dc02dae704f2e5a4968bc0765",
-                    "nonce" : "0xe1d83fb6d67968ed",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xd19be3cc65174665854dd5ccef6d7ac97fd18fe9b9f27effea9e1efe5defd31d",
+                    "mixHash" : "0x902299b0b42bae7afefca024527914c7ac4daae568de0f5d80d0cdc21510cfcf",
+                    "nonce" : "0xd4e51175542c585a",
                     "number" : "0x01",
                     "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "0x076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
-                    "stateRoot" : "0xb840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeb",
+                    "receiptTrie" : "0x263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2",
+                    "stateRoot" : "0x698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0a94de744aa2ca75920f462f8cda2f8a4b79d3d8dc02dae704f2e5a4968bc076588e1d83fb6d67968edf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0698e670a1c444b8cd91d9e5362c042389708c0f2fae24ec13420d8078fb2a0b3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0263bb47e7b4b74da3ab4b24c805e86c6b48e7b68b8bd3cb756a2dc97ddf2e2d2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0902299b0b42bae7afefca024527914c7ac4daae568de0f5d80d0cdc21510cfcf88d4e51175542c585af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac7d3665c56063de8a7e69108cb5913448bbb124a7ec5d3bdb8abf02cdbe772b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd19be3cc65174665854dd5ccef6d7ac97fd18fe9b9f27effea9e1efe5defd31d",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcallcodecall_010_d0g0v0_Homestead" : {
+    "callcallcodecall_010_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/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0xdf7abfdda0a971c9e790bd6de3569432090137c891a52f657e4651d49e18c1e8",
-                    "mixHash" : "0xed082295e122993ddfbdb7b6d4f095e181ac59322612e1aab859e01a8b54f3ff",
-                    "nonce" : "0x101f1662a58cccf5",
+                    "hash" : "0x5ad5d0c21c738ac51e52811931c616f6d08f93bd2c26288e736bf271d4cc2b24",
+                    "mixHash" : "0xb4d56825c4e6abeb88fa84b3a2ce0256f9d3ea9d1ec423e376c2617e970b843b",
+                    "nonce" : "0x9c061f05aaeb0f86",
                     "number" : "0x01",
                     "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
                     "receiptTrie" : "0x076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0ed082295e122993ddfbdb7b6d4f095e181ac59322612e1aab859e01a8b54f3ff88101f1662a58cccf5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0b4d56825c4e6abeb88fa84b3a2ce0256f9d3ea9d1ec423e376c2617e970b843b889c061f05aaeb0f86f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf7abfdda0a971c9e790bd6de3569432090137c891a52f657e4651d49e18c1e8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5ad5d0c21c738ac51e52811931c616f6d08f93bd2c26288e736bf271d4cc2b24",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcallcodecall_010_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_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/stCallCodes/callcallcodecall_010_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0x2eba445211ae32e318cfd5cbc74e038362dbd5452c600492f2e981e42d664fc0",
-                    "mixHash" : "0xa2ee12011884dc33836955ace390a94a3c126cdc0e80838a4d4b76d24b43ae7f",
-                    "nonce" : "0xbf1b74f080e01176",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0xae3cda9be8311062bddfb62fa8aed7ab43b9bfadbba82beff2b851438338d5a7",
+                    "mixHash" : "0x2f7e7dec0d827d42dcd2b498add2f90f42df3dc9780df7b1ac43e8b1d44fa606",
+                    "nonce" : "0xae31c6dc8f8c6712",
                     "number" : "0x01",
                     "parentHash" : "0x0b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0x75a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60",
+                    "receiptTrie" : "0x076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81",
+                    "stateRoot" : "0xb840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075a5187a022e4a9c96f99c0ecb155094f1880f9b2c6e4a437229db1c8e855f60a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0a2ee12011884dc33836955ace390a94a3c126cdc0e80838a4d4b76d24b43ae7f88bf1b74f080e01176f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a00b9a08007df4cb7bff3f969a228006a8f366bfc42754ab610d6ff3c1ed591278a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b840be4f896a13d47fa2946cb8d8444ddd7475c1e0536be1cde36412b9e0abeba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0076c3090b7194dc1fe99c4bc2f91ea4baab7d1ae64315be0612cba2c7e4e8c81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a02f7e7dec0d827d42dcd2b498add2f90f42df3dc9780df7b1ac43e8b1d44fa60688ae31c6dc8f8c6712f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d585f2dca5b231004260da91ccb1c5175403c18f1a9acad558a03550ede95cea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2eba445211ae32e318cfd5cbc74e038362dbd5452c600492f2e981e42d664fc0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xae3cda9be8311062bddfb62fa8aed7ab43b9bfadbba82beff2b851438338d5a7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
index c67045fcb..983811d88 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0x75664c2f023d074e29f929f5cc7126d7b6ff97f813480195aacca27f1e5d8066",
-                    "mixHash" : "0x11594c594c9f8a07bee1c54175db063efe53682b5002c3e5a2617d415e43a5b1",
-                    "nonce" : "0x10403bae0b70d80f",
+                    "hash" : "0xabcfffd606fa8a5b773106820363d789c615931c7e46d6ab608f468ea59aa516",
+                    "mixHash" : "0xe340775b242d4d6152d718d5883f4f15b1acae5153626171b67b661687f07a38",
+                    "nonce" : "0x46835d0a2a24b870",
                     "number" : "0x01",
                     "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "0x38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
-                    "stateRoot" : "0xdf5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xeea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a011594c594c9f8a07bee1c54175db063efe53682b5002c3e5a2617d415e43a5b18810403bae0b70d80ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0e340775b242d4d6152d718d5883f4f15b1acae5153626171b67b661687f07a388846835d0a2a24b870f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75664c2f023d074e29f929f5cc7126d7b6ff97f813480195aacca27f1e5d8066",
-        "network" : "EIP150",
+        "lastblockhash" : "0xabcfffd606fa8a5b773106820363d789c615931c7e46d6ab608f468ea59aa516",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcallcodecall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcallcodecall_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x6a2768a6f3486a74fa3a2ef34de8545355f257d911df6bc39614986a3e7cd529",
+                    "mixHash" : "0x8ca956d37dd11634645e8e7894ca571b54779d4e135a8bf14b2151d46fee4cb3",
+                    "nonce" : "0x93e01389d89bd2f3",
+                    "number" : "0x01",
+                    "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xeea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08ca956d37dd11634645e8e7894ca571b54779d4e135a8bf14b2151d46fee4cb38893e01389d89bd2f3f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a2768a6f3486a74fa3a2ef34de8545355f257d911df6bc39614986a3e7cd529",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xe5ab1b1893759414be8f7007501d18a324e4c974da9ef28af4934ca03e29332b",
-                    "mixHash" : "0xcb0817c85e34d27deff14495613ec8edb883c6dc4e813b1df40007f635c38737",
-                    "nonce" : "0xbe0cead9e2e20d34",
+                    "hash" : "0xe7234842b224ba908a34909df6e169e6c9520a5226ea069066d00b5522787702",
+                    "mixHash" : "0x531b636ebe09bb84d7a21df85c947fe58a4935b02aa94e8ebe2c4fc5128c4923",
+                    "nonce" : "0xbeecb99237cc97f6",
                     "number" : "0x01",
                     "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
                     "receiptTrie" : "0x38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0cb0817c85e34d27deff14495613ec8edb883c6dc4e813b1df40007f635c3873788be0cead9e2e20d34f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0531b636ebe09bb84d7a21df85c947fe58a4935b02aa94e8ebe2c4fc5128c492388beecb99237cc97f6f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5ab1b1893759414be8f7007501d18a324e4c974da9ef28af4934ca03e29332b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe7234842b224ba908a34909df6e169e6c9520a5226ea069066d00b5522787702",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcallcodecall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0x9a410fbd632a5f3f2aced8aed0e30ecccf1291f483657681304f7eb4413345e7",
-                    "mixHash" : "0xa2b9efd5f4522f9a9e254f0313acc3b7e6a8c42fb3e122b7d7fa2feef0bab19b",
-                    "nonce" : "0x4072c7bc290a4161",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x4fdcdafa17b26f1f11b0437f2f5da1ed76663a72e3ec59c9e9376c91890f8f05",
+                    "mixHash" : "0x3714026c3c6599bf5f42cfd501d9772993ff374b569ef9562ae52e99455ee047",
+                    "nonce" : "0x1f8003751a80cb4f",
                     "number" : "0x01",
                     "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "0xd19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
-                    "stateRoot" : "0x1fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8",
+                    "receiptTrie" : "0x38f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255",
+                    "stateRoot" : "0xdf5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a2b9efd5f4522f9a9e254f0313acc3b7e6a8c42fb3e122b7d7fa2feef0bab19b884072c7bc290a4161f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df5f4e6310bac9434e164011e9c1215ee983f3a14008212d1df08b39c3a3d309a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a038f9bf3bdda1e331855a1507ca1ac29a0d8746d19080b9f1e0288a65b616c255b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a03714026c3c6599bf5f42cfd501d9772993ff374b569ef9562ae52e99455ee047881f8003751a80cb4ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a410fbd632a5f3f2aced8aed0e30ecccf1291f483657681304f7eb4413345e7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4fdcdafa17b26f1f11b0437f2f5da1ed76663a72e3ec59c9e9376c91890f8f05",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcallcodecall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x6a764bbc540877f863c42a47dd5f163b5601e5ffc5eb22b78e402c1cefb07c3a",
-                    "mixHash" : "0xa2ce359da3cd5cf23185e164bd8e06f4b7237f67976fc5a4fda5bf3fd39995ea",
-                    "nonce" : "0x8e8692c835dcd2b1",
+                    "hash" : "0x4d610c48f0747a556c134054dabcf7d55e736b5019d3531696969cd1adfd8a45",
+                    "mixHash" : "0x3189f5682e2e3ae0d2d4bf95b89d5895b9da5eb878ab588f294ec314adc4ea59",
+                    "nonce" : "0xadcd9dde1983b5ac",
                     "number" : "0x01",
                     "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
                     "receiptTrie" : "0xd19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a2ce359da3cd5cf23185e164bd8e06f4b7237f67976fc5a4fda5bf3fd39995ea888e8692c835dcd2b1f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a03189f5682e2e3ae0d2d4bf95b89d5895b9da5eb878ab588f294ec314adc4ea5988adcd9dde1983b5acf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a764bbc540877f863c42a47dd5f163b5601e5ffc5eb22b78e402c1cefb07c3a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4d610c48f0747a556c134054dabcf7d55e736b5019d3531696969cd1adfd8a45",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcallcodecall_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0x1a1bbe8e843a168e6f59d0d6b9c263dc4356fec0ae80364f06e72b4fa044fdda",
-                    "mixHash" : "0x8528a7cc3b6ce8c01a71437ce2b768c8b02479b0f517a43881e13d0c95e2c127",
-                    "nonce" : "0xb3748b4bd2a2030e",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0xb18e437864d8943827dc59132145e1eda8878be43552602173904cf8f7a9d06c",
+                    "mixHash" : "0x754060fc58d0e1ed7413febe6f434413775dbfe24c20f39c973504263571ea39",
+                    "nonce" : "0x76a145582341ac07",
                     "number" : "0x01",
                     "parentHash" : "0xfc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11c",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0xeea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6",
+                    "receiptTrie" : "0xd19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631f",
+                    "stateRoot" : "0x1fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eea67a57635964b262d077099b59e9e95d0384d79527fb98256848e49dcbb6d6a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08528a7cc3b6ce8c01a71437ce2b768c8b02479b0f517a43881e13d0c95e2c12788b3748b4bd2a2030ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0fc9f20a3d4ae1ac2ab4d96e0db654f3a23a7f2f1b8bcd0955bd1755c2d6da11ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd6dfb47efb7e2d94fd33ff4f66be243823d4ad614dacf6bef0a21099b88af8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d19d63e7da6a8df437a301489043093b28cfe4f3eea14ab9033d1ee98c70631fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0754060fc58d0e1ed7413febe6f434413775dbfe24c20f39c973504263571ea398876a145582341ac07f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8b1736923571f4398d89300e34a354d72451980ffd1660f53362580981f2cf9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a1bbe8e843a168e6f59d0d6b9c263dc4356fec0ae80364f06e72b4fa044fdda",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb18e437864d8943827dc59132145e1eda8878be43552602173904cf8f7a9d06c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0.json
index 1a3ed9815..190ba0ee9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_011_OOGE_d0g0v0_EIP150" : {
+    "callcallcodecallcode_011_OOGE_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/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x929e663231aa855b2375253ffe27876d67016f07cc5077fa18f3754c49c44a7f",
-                    "mixHash" : "0xf3ccf0308ed5e99da4934adac6107fbbfe8ee8c71d260276849cf45a5e519ffb",
-                    "nonce" : "0x840cb5c7ff267178",
+                    "hash" : "0xa0abafeca1e33f550125f8ea8ef6c749faedfa53a0df9094692e1ac1e8338c45",
+                    "mixHash" : "0xf81b03a62a7bdc5c6d5bdf65cf1c4065699b2545081db4ef4da9eba375d0545c",
+                    "nonce" : "0xdd16ccfb10cbee30",
                     "number" : "0x01",
                     "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "0xadedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
-                    "stateRoot" : "0xba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7b",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f3ccf0308ed5e99da4934adac6107fbbfe8ee8c71d260276849cf45a5e519ffb88840cb5c7ff267178f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f81b03a62a7bdc5c6d5bdf65cf1c4065699b2545081db4ef4da9eba375d0545c88dd16ccfb10cbee30f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x929e663231aa855b2375253ffe27876d67016f07cc5077fa18f3754c49c44a7f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa0abafeca1e33f550125f8ea8ef6c749faedfa53a0df9094692e1ac1e8338c45",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGE_d0g0v0_EIP158" : {
+    "callcallcodecallcode_011_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x6c1070693099fc57761d6b79773dcb68a667da95347820ef1bd0417aedf4497a",
+                    "mixHash" : "0xcb06171163edebb04f90505a565ac1efedc673b9beac2f0b7e73e8b86f9681f6",
+                    "nonce" : "0xaac933edc5b6b243",
+                    "number" : "0x01",
+                    "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0cb06171163edebb04f90505a565ac1efedc673b9beac2f0b7e73e8b86f9681f688aac933edc5b6b243f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6c1070693099fc57761d6b79773dcb68a667da95347820ef1bd0417aedf4497a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_OOGE_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/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x78ef015e889bd774ba65adc5d1552a915887caeed69a6836a4558e2fb9f73b9e",
-                    "mixHash" : "0x129f928c830d948c08fafeda35cb6f055f7485ba62a0a8acda0b25782e0686cf",
-                    "nonce" : "0xc4ddd5f8c5cf67fb",
+                    "hash" : "0x2e1e45137e5d948bb653c4bd9e89e38ef17016439bc7a41f1a4367413b5223de",
+                    "mixHash" : "0x39e302174a643a201c6a28ac0d36ddef8aadb3a8e94d78b9fb61b03f9f092d8d",
+                    "nonce" : "0x82e3dda8a8554a0f",
                     "number" : "0x01",
                     "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
                     "receiptTrie" : "0xadedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0129f928c830d948c08fafeda35cb6f055f7485ba62a0a8acda0b25782e0686cf88c4ddd5f8c5cf67fbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a039e302174a643a201c6a28ac0d36ddef8aadb3a8e94d78b9fb61b03f9f092d8d8882e3dda8a8554a0ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78ef015e889bd774ba65adc5d1552a915887caeed69a6836a4558e2fb9f73b9e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2e1e45137e5d948bb653c4bd9e89e38ef17016439bc7a41f1a4367413b5223de",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGE_d0g0v0_Frontier" : {
+    "callcallcodecallcode_011_OOGE_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/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0xd04d7a0d7084b1d6fe4efa70225ec3d64033d951de246d2e209f981c509b07cf",
-                    "mixHash" : "0xabfe085b5936eb6f8cacfdb36399e9145a6020735bafa3b982e239760ced9385",
-                    "nonce" : "0x56f6293d0136f7fd",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x52ae3f4396d99781d1e14f4697639ee0a13089a523b5e5fc756290c9c4e7dbbf",
+                    "mixHash" : "0xf8d7ff7c893ab9b004ae31b332a15e8029203c765d188ebc2df893c9988a51e8",
+                    "nonce" : "0x673e3c7eba181e13",
                     "number" : "0x01",
                     "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "0xde0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
-                    "stateRoot" : "0xfb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690",
+                    "receiptTrie" : "0xadedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6a",
+                    "stateRoot" : "0xba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0abfe085b5936eb6f8cacfdb36399e9145a6020735bafa3b982e239760ced93858856f6293d0136f7fdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba828f05e207664016f3302c063ce4e9f79e65c8d8ce70b229b68b9ccf412f7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adedf4b025f17a7cec34310dc98c71fc887b7f308a1172ed142cc74315c8cf6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f8d7ff7c893ab9b004ae31b332a15e8029203c765d188ebc2df893c9988a51e888673e3c7eba181e13f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd04d7a0d7084b1d6fe4efa70225ec3d64033d951de246d2e209f981c509b07cf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x52ae3f4396d99781d1e14f4697639ee0a13089a523b5e5fc756290c9c4e7dbbf",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGE_d0g0v0_Homestead" : {
+    "callcallcodecallcode_011_OOGE_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/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0x155a5b9b4e283837c366b4cc5b68926c45b67abeb36889d9f6caa3354d47886e",
-                    "mixHash" : "0x25cb5b13fca2335312d882e17f1b4c5ec9a2469aab5bcd1ae5b1157ff4cdcbae",
-                    "nonce" : "0x4d1ba3e2bf82b26f",
+                    "hash" : "0xed586b653730172db26db4e3b7feaf6e5786466e31fce254511f1420d78e20fd",
+                    "mixHash" : "0x56ac3ba2b45097578eaeb7664af2eeb3670d5ae344ed61973d45190819ca81d9",
+                    "nonce" : "0xbff8cd200cb4286f",
                     "number" : "0x01",
                     "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
                     "receiptTrie" : "0xde0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a025cb5b13fca2335312d882e17f1b4c5ec9a2469aab5bcd1ae5b1157ff4cdcbae884d1ba3e2bf82b26ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a056ac3ba2b45097578eaeb7664af2eeb3670d5ae344ed61973d45190819ca81d988bff8cd200cb4286ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x155a5b9b4e283837c366b4cc5b68926c45b67abeb36889d9f6caa3354d47886e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xed586b653730172db26db4e3b7feaf6e5786466e31fce254511f1420d78e20fd",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGE_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_011_OOGE_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/stCallCodes/callcallcodecallcode_011_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0x92856c27b02891d4792dc61f5f7832c40f9c780354d762dc475a29e53207712e",
-                    "mixHash" : "0x5d90c6dc42cd94b2993a466c17e706589f0e7c6f2438f96841ef2e15d8e628b2",
-                    "nonce" : "0xae3eb3b2281f8e16",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0x1b69186baae9d58cdb8da622ab01b069c2c8d69a81ff45ea83a4ca884decfdab",
+                    "mixHash" : "0x56eb45492ffe2a46f1508b5f8658048d821296793f6fbda9b5391c5d48987d74",
+                    "nonce" : "0x872314d1b0bb3f22",
                     "number" : "0x01",
                     "parentHash" : "0x77c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0x664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539a",
+                    "receiptTrie" : "0xde0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382",
+                    "stateRoot" : "0xfb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0664cc5b08fa86417f94a8dbae65f0610c3c491a72d62eade87ce78cb8d3f539aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05d90c6dc42cd94b2993a466c17e706589f0e7c6f2438f96841ef2e15d8e628b288ae3eb3b2281f8e16f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a077c0c8f226078f7f70b6cfbaefbdf4a9df898fa84e066977a73ab86fe8d17dc3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3ed53f121c2ca8e4ae2d46424167f0c3fd398542b7b0f538909e59180ec690a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0de0abe5ddfe2a7c3654974b726b9b34cb88a6dd2c87d0a780587f42df907f382b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a056eb45492ffe2a46f1508b5f8658048d821296793f6fbda9b5391c5d48987d7488872314d1b0bb3f22f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ead39e3b1e04ef61963aa2898dc3ec73715a3ee2026b3d60721cb633174bac4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92856c27b02891d4792dc61f5f7832c40f9c780354d762dc475a29e53207712e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1b69186baae9d58cdb8da622ab01b069c2c8d69a81ff45ea83a4ca884decfdab",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
index 4af77be71..2e2a48870 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_011_OOGMAfter_d0g0v0_EIP150" : {
+    "callcallcodecallcode_011_OOGMAfter_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/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xf8f3ad2310e79bf3f8eefb260e95d34f811ddb71db383afb37baa77b02f6315b",
-                    "mixHash" : "0xd2ef401c890e84fc8acdccdf0a61a202dbf7e6c8e17ee283727d7b11275f98a7",
-                    "nonce" : "0x0b8021d14c6f0398",
+                    "hash" : "0xcd80e1efa19d85a85f7b7356e2ae356cd3337b899985669a2a44a2af9e29f14b",
+                    "mixHash" : "0xaa0e7447f72151289d0f08a98e926b1ebbeced287398bebf70989182a0bbe8f3",
+                    "nonce" : "0x0c339b6bb18517dc",
                     "number" : "0x01",
                     "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
-                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x5366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0d2ef401c890e84fc8acdccdf0a61a202dbf7e6c8e17ee283727d7b11275f98a7880b8021d14c6f0398f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0aa0e7447f72151289d0f08a98e926b1ebbeced287398bebf70989182a0bbe8f3880c339b6bb18517dcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8f3ad2310e79bf3f8eefb260e95d34f811ddb71db383afb37baa77b02f6315b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcd80e1efa19d85a85f7b7356e2ae356cd3337b899985669a2a44a2af9e29f14b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMAfter_d0g0v0_EIP158" : {
+    "callcallcodecallcode_011_OOGMAfter_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/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x2c00f5d7c7c647b2b5ee8dd43d68c208ea0f8e3963a4273420a5ad795dffd224",
-                    "mixHash" : "0xcf1f8788e24245f8beccf132a04ee755f57dd8eab7ec4cb43e6aff20355fc9a6",
-                    "nonce" : "0xeb85cc16b43535e5",
+                    "hash" : "0xdaaff131fceeaf920228561d0cf4da85c6522cacc521c3d5b4d5c8dc033da54d",
+                    "mixHash" : "0xe4e5432df5131b8a5526ab379478ca0d78d8f978cbef771f63fae084d3caa736",
+                    "nonce" : "0xedd3b331e5a19fe5",
+                    "number" : "0x01",
+                    "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x5366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0e4e5432df5131b8a5526ab379478ca0d78d8f978cbef771f63fae084d3caa73688edd3b331e5a19fe5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdaaff131fceeaf920228561d0cf4da85c6522cacc521c3d5b4d5c8dc033da54d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x0877bb21d1ddfb9861787f599b5706ee831295b90e48d2e9d52af18d9015556a",
+                    "mixHash" : "0xde5e64ceb1797a6e186be1044de41366e69168ead06fb361d526878a86635b56",
+                    "nonce" : "0xf15de3e46939c8e3",
                     "number" : "0x01",
                     "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
                     "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0cf1f8788e24245f8beccf132a04ee755f57dd8eab7ec4cb43e6aff20355fc9a688eb85cc16b43535e5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0de5e64ceb1797a6e186be1044de41366e69168ead06fb361d526878a86635b5688f15de3e46939c8e3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c00f5d7c7c647b2b5ee8dd43d68c208ea0f8e3963a4273420a5ad795dffd224",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0877bb21d1ddfb9861787f599b5706ee831295b90e48d2e9d52af18d9015556a",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMAfter_d0g0v0_Frontier" : {
+    "callcallcodecallcode_011_OOGMAfter_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/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x3d52866670132d2dd55a6e029e2da82251c18d9ba080a55882e9c72a43ec889c",
-                    "mixHash" : "0xd87ce1339645f12bd416999d107f7b4c1e4d3bfede80c4c42f05052a8fa42664",
-                    "nonce" : "0x2fddc43f957904de",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0xe2fdb9c3480fde97d48af793483647af6953099ed08a0ba325a52127817affed",
+                    "mixHash" : "0x6ba8361bcee3d14240c5601e022d484ea50a81ec888ca1badba5012dd8063da7",
+                    "nonce" : "0x698f6254e68e202a",
                     "number" : "0x01",
                     "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
-                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
+                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
+                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d87ce1339645f12bd416999d107f7b4c1e4d3bfede80c4c42f05052a8fa42664882fddc43f957904def862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a06ba8361bcee3d14240c5601e022d484ea50a81ec888ca1badba5012dd8063da788698f6254e68e202af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d52866670132d2dd55a6e029e2da82251c18d9ba080a55882e9c72a43ec889c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe2fdb9c3480fde97d48af793483647af6953099ed08a0ba325a52127817affed",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMAfter_d0g0v0_Homestead" : {
+    "callcallcodecallcode_011_OOGMAfter_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/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xd4bac266a318fa620919727e1452f8efce54d918a8d062750fe20470c8a96296",
-                    "mixHash" : "0x5cd7a5d759d0ed7276de1ab490a1630f73d8a7e3b0c9715685d12ac4ffcf7e2d",
-                    "nonce" : "0x5699132286ba15d7",
+                    "hash" : "0x09a063db64da2925db214b18162326b4507e595d79e9564663b63a0b3830857c",
+                    "mixHash" : "0xc950d86dd36bb3cc6c21f18b4ee0ec2feb8fc4fd6acce2ae2bbcaa7759282a0e",
+                    "nonce" : "0xeac5d3acc329a7a9",
                     "number" : "0x01",
                     "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
                     "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a05cd7a5d759d0ed7276de1ab490a1630f73d8a7e3b0c9715685d12ac4ffcf7e2d885699132286ba15d7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c950d86dd36bb3cc6c21f18b4ee0ec2feb8fc4fd6acce2ae2bbcaa7759282a0e88eac5d3acc329a7a9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4bac266a318fa620919727e1452f8efce54d918a8d062750fe20470c8a96296",
-        "network" : "Homestead",
+        "lastblockhash" : "0x09a063db64da2925db214b18162326b4507e595d79e9564663b63a0b3830857c",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_011_OOGMAfter_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/stCallCodes/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x714d5553dbfb49475343c0b893220a4a5fdde07da357dc386fc4d29602405a9b",
-                    "mixHash" : "0x2d23fdab5973edc7ccf4b161f0564bef59a2337c5086833101cc055899515a93",
-                    "nonce" : "0x797fc26328694dee",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x32019c05fd56700b8b8eb190b4995c0dca07faa849e3f6e3e6194df46c86ec49",
+                    "mixHash" : "0x5163794287b3cba5f5922f865c73ae44a53b9a34594fb6af0be63bb26f04cc2b",
+                    "nonce" : "0x18d749ae543d99dc",
                     "number" : "0x01",
                     "parentHash" : "0x56aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8b",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0x5366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00",
+                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
+                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a02d23fdab5973edc7ccf4b161f0564bef59a2337c5086833101cc055899515a9388797fc26328694deef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a056aa80587398bac82739d0b3b7f92cb42996df08cdef97aa2ec3811f99edec8ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a05163794287b3cba5f5922f865c73ae44a53b9a34594fb6af0be63bb26f04cc2b8818d749ae543d99dcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x714d5553dbfb49475343c0b893220a4a5fdde07da357dc386fc4d29602405a9b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x32019c05fd56700b8b8eb190b4995c0dca07faa849e3f6e3e6194df46c86ec49",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
index dfad28fe4..ad987acb3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_011_OOGMBefore_d0g0v0_EIP150" : {
+    "callcallcodecallcode_011_OOGMBefore_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/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x69b36a9e30d8e33d745e264d62a43e50af70f1984365de3b80eae8811e388c1f",
-                    "mixHash" : "0x3949c54138cb2f6efb7771bb0a89aa50c471ccd8819fd5f4669a8f42a648ac08",
-                    "nonce" : "0x77ec76bf02ad57cc",
+                    "hash" : "0x17254305b3530683a6e259e72b248824b244fb9551ead509b2aca0023abe5e40",
+                    "mixHash" : "0x180af3624b113cde73f661e97ddeeb4380aac2968bb212110901a1db1b83e7a3",
+                    "nonce" : "0xe95f9d4679ba95fe",
                     "number" : "0x01",
                     "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "0x2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
-                    "stateRoot" : "0x04be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a03949c54138cb2f6efb7771bb0a89aa50c471ccd8819fd5f4669a8f42a648ac088877ec76bf02ad57ccf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0180af3624b113cde73f661e97ddeeb4380aac2968bb212110901a1db1b83e7a388e95f9d4679ba95fef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69b36a9e30d8e33d745e264d62a43e50af70f1984365de3b80eae8811e388c1f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x17254305b3530683a6e259e72b248824b244fb9551ead509b2aca0023abe5e40",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMBefore_d0g0v0_EIP158" : {
+    "callcallcodecallcode_011_OOGMBefore_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/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x5514c47c0f01102dce406b57ffcf1945e66dc8a141babb069ed3003743ffdeab",
-                    "mixHash" : "0x402d7c0d1b001ba7f8ed084ad2b74f37ed32e270c1712b2e517d5b9c3e88ff53",
-                    "nonce" : "0x6cfa3e5f4bb5d336",
+                    "hash" : "0x8599c122db63617989b5db078cfd893fa5ffd7687c8497f8f228b6ae6e926f3a",
+                    "mixHash" : "0xfe9920e64734f9939a97bf03b61d7f166297c942efa3cc3607f7e03bd7a31c4c",
+                    "nonce" : "0x4680d15b14ddfe6f",
+                    "number" : "0x01",
+                    "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0fe9920e64734f9939a97bf03b61d7f166297c942efa3cc3607f7e03bd7a31c4c884680d15b14ddfe6ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8599c122db63617989b5db078cfd893fa5ffd7687c8497f8f228b6ae6e926f3a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xed45f268eb1bc4947df20fc04d5b2d589fe424cdc94ea7343c27312bb3658754",
+                    "mixHash" : "0x9edb57fa59a04ec411977de2a5b69e3adacf8c3da70e44ae054bdedec4beef71",
+                    "nonce" : "0xb9ba723ab3e90492",
                     "number" : "0x01",
                     "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
                     "receiptTrie" : "0x2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0402d7c0d1b001ba7f8ed084ad2b74f37ed32e270c1712b2e517d5b9c3e88ff53886cfa3e5f4bb5d336f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a09edb57fa59a04ec411977de2a5b69e3adacf8c3da70e44ae054bdedec4beef7188b9ba723ab3e90492f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5514c47c0f01102dce406b57ffcf1945e66dc8a141babb069ed3003743ffdeab",
-        "network" : "EIP158",
+        "lastblockhash" : "0xed45f268eb1bc4947df20fc04d5b2d589fe424cdc94ea7343c27312bb3658754",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMBefore_d0g0v0_Frontier" : {
+    "callcallcodecallcode_011_OOGMBefore_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/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x339bb2d960d1ff555adb93b2d813a598335fc80811d7a1cd6ebbfe7494291033",
-                    "mixHash" : "0x6d6c8bbbd1a01da907cca085cf2606c97e9a65e1ffefb92c68fb10d4f3d81139",
-                    "nonce" : "0xb8632e2c35e529d9",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x852b44c954a14b695345e853b33b237f2358500a5bc1399b2f30506003028544",
+                    "mixHash" : "0xaff3d1193156e194671b327e809577f2d5e9c4e9c533f81fb924d4ddff5078e4",
+                    "nonce" : "0xd504b1fd6531c22b",
                     "number" : "0x01",
                     "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "0x880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
-                    "stateRoot" : "0x5773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44",
+                    "receiptTrie" : "0x2da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761af",
+                    "stateRoot" : "0x04be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a06d6c8bbbd1a01da907cca085cf2606c97e9a65e1ffefb92c68fb10d4f3d8113988b8632e2c35e529d9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004be47b93cbbc9621e706c5ace7711a06043764e5f3596e379799d35e0bb63b5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02da22ab4992ff29871438eb68f0d6fb255eea7fbdd68252ecd58d3c6e0f761afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0aff3d1193156e194671b327e809577f2d5e9c4e9c533f81fb924d4ddff5078e488d504b1fd6531c22bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x339bb2d960d1ff555adb93b2d813a598335fc80811d7a1cd6ebbfe7494291033",
-        "network" : "Frontier",
+        "lastblockhash" : "0x852b44c954a14b695345e853b33b237f2358500a5bc1399b2f30506003028544",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMBefore_d0g0v0_Homestead" : {
+    "callcallcodecallcode_011_OOGMBefore_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/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xaf9645d8743ee6ced8a1c8d7e1d2c1c7abb48010c75d114f06a01ce62257f3e9",
-                    "mixHash" : "0xd3dac25d1a04ef0b70cdb2fad85f5df5e448f5a873e3d8f19863a2a13a906218",
-                    "nonce" : "0x8937417edc9e6b48",
+                    "hash" : "0x901ac24847cdd6b9a7a100dc02e6ca2ca7e72928905349ff6aa0c45005767b72",
+                    "mixHash" : "0x74c67f0af966060ed3bbad1b31f2b22ce58a11059a75280719cafd2d4d26a5f7",
+                    "nonce" : "0x8dc6ae64fe7f8dca",
                     "number" : "0x01",
                     "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
                     "receiptTrie" : "0x880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0d3dac25d1a04ef0b70cdb2fad85f5df5e448f5a873e3d8f19863a2a13a906218888937417edc9e6b48f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a074c67f0af966060ed3bbad1b31f2b22ce58a11059a75280719cafd2d4d26a5f7888dc6ae64fe7f8dcaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf9645d8743ee6ced8a1c8d7e1d2c1c7abb48010c75d114f06a01ce62257f3e9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x901ac24847cdd6b9a7a100dc02e6ca2ca7e72928905349ff6aa0c45005767b72",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_011_OOGMBefore_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/stCallCodes/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0xfe87379021a10523399f17004e0ec58755a55377010c91ab0f2a67efd95d893f",
-                    "mixHash" : "0x5f493b8fcec6ab006c7575c29d460ee871d5caff5090ca1361388c649d890fb9",
-                    "nonce" : "0x256447414c5b959e",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x270573bcf1dd4dd658747b4dcd6b7c0054fc5de6b0847edad9d68a3f3fde91d0",
+                    "mixHash" : "0x2d84bae5eab7d3d797d7b809dda2b4705226749cabfce8a795a8ba696caafc32",
+                    "nonce" : "0x9db068d082947a2a",
                     "number" : "0x01",
                     "parentHash" : "0x2fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5f",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0xae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2",
+                    "receiptTrie" : "0x880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06",
+                    "stateRoot" : "0x5773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0c878e566a25c03ba91f8b7a4e02bea741d9f8f438b3a5b52e1c338aa276d2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a05f493b8fcec6ab006c7575c29d460ee871d5caff5090ca1361388c649d890fb988256447414c5b959ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02fa68f125ce1a29de68fd633170581353d7c8e36ea2f6f39aa5cd9a14a7dca5fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05773dc8c57c4ed7eeba0faa6a10d7b53042ff0649928867caf08ca2e9eb12d44a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0880b026572d5166b95e88baf6bef126fe6e04b298c64ac64df694e2e29a40f06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a02d84bae5eab7d3d797d7b809dda2b4705226749cabfce8a795a8ba696caafc32889db068d082947a2af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084e448b11e840d6d7e246998bb137c000c77041622de1b16ccdc2afa4fefb5fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe87379021a10523399f17004e0ec58755a55377010c91ab0f2a67efd95d893f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x270573bcf1dd4dd658747b4dcd6b7c0054fc5de6b0847edad9d68a3f3fde91d0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
index 156ea8016..0a4cd9dbe 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_011_SuicideEnd_d0g0v0_EIP150" : {
+    "callcallcodecallcode_011_SuicideEnd_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/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xaf42f35960dbc5659648807715ca5a3200abd2c2bcdd0e28682a1c9a39f57af1",
-                    "mixHash" : "0x9f7385618197d3bac18197369c9e71e30031db80a9735634cc902cba03e00328",
-                    "nonce" : "0x112ca0b2fce141d2",
+                    "hash" : "0x5bf5a100416e87c89f36fb06a5b765b9bfd6da984183622d4168bc2fc726e2ac",
+                    "mixHash" : "0x3102fa110a49d51df0d55a622a1052a771eb498d94c5d31574f951591f795e22",
+                    "nonce" : "0x07fae0e5367403d4",
                     "number" : "0x01",
                     "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "0x295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
-                    "stateRoot" : "0x1c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a09f7385618197d3bac18197369c9e71e30031db80a9735634cc902cba03e0032888112ca0b2fce141d2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a03102fa110a49d51df0d55a622a1052a771eb498d94c5d31574f951591f795e228807fae0e5367403d4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf42f35960dbc5659648807715ca5a3200abd2c2bcdd0e28682a1c9a39f57af1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5bf5a100416e87c89f36fb06a5b765b9bfd6da984183622d4168bc2fc726e2ac",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -140,10 +147,158 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideEnd_d0g0v0_EIP158" : {
+    "callcallcodecallcode_011_SuicideEnd_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0xf745efb928a220cfdc2bae69692456b155975deb29e0aa0dc6eed5deff7bd5bc",
+                    "mixHash" : "0x2bf5b9fcf20713991917b696a3dbad2d27fa4b7a4c97bda48e9a648a6b009427",
+                    "nonce" : "0x3ee8cf27e20a07be",
+                    "number" : "0x01",
+                    "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a02bf5b9fcf20713991917b696a3dbad2d27fa4b7a4c97bda48e9a648a6b009427883ee8cf27e20a07bef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf745efb928a220cfdc2bae69692456b155975deb29e0aa0dc6eed5deff7bd5bc",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_SuicideEnd_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/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -155,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x11402f06ab2ad5273b84347a423879eb4cb4b0c47b54e4726bff039574419df6",
-                    "mixHash" : "0x81ad3270a611c60d279ad3cb1697f73e4e61d652678551755d02d1704a4ffbd7",
-                    "nonce" : "0x5ed0d47e55512ff8",
+                    "hash" : "0x45819f6ff4a8e5294ef46a210f0ef2c1413d2166df0cff671df9495bc0f2da97",
+                    "mixHash" : "0x5499806397b8364fa867d951c0b416184fa970f3f8d29f7824fc51792085cda5",
+                    "nonce" : "0xc27564c8e031d975",
                     "number" : "0x01",
                     "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
                     "receiptTrie" : "0x295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
@@ -166,7 +321,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a081ad3270a611c60d279ad3cb1697f73e4e61d652678551755d02d1704a4ffbd7885ed0d47e55512ff8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a05499806397b8364fa867d951c0b416184fa970f3f8d29f7824fc51792085cda588c27564c8e031d975f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -203,8 +358,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11402f06ab2ad5273b84347a423879eb4cb4b0c47b54e4726bff039574419df6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x45819f6ff4a8e5294ef46a210f0ef2c1413d2166df0cff671df9495bc0f2da97",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -281,10 +436,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideEnd_d0g0v0_Frontier" : {
+    "callcallcodecallcode_011_SuicideEnd_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/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -295,19 +450,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0x81a9077b89901fc7f8d55c21d035980bb3b860ff027e8557a60c538b7d0e3bc6",
-                    "mixHash" : "0xa667e00ce7d92e4fb1172795767167c8dd274513a4db04f2b0f722655c14e160",
-                    "nonce" : "0x3cf38465e198d951",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x6338ac1fc9532f6a397227e9731cf970efef170be37b18ea82967880c4be4141",
+                    "mixHash" : "0xf15c12784fe3757bb8675070938136dac4eeae1cad0996e74dfdc21b84248534",
+                    "nonce" : "0x4aa79dde6c5b1030",
                     "number" : "0x01",
                     "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "0x8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
-                    "stateRoot" : "0x712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6d",
+                    "receiptTrie" : "0x295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6",
+                    "stateRoot" : "0x1c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0a667e00ce7d92e4fb1172795767167c8dd274513a4db04f2b0f722655c14e160883cf38465e198d951f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c5f3e66713696c86e3f2541218ff3c65dc0880e635b4fe4cc6657e347a97ac2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0295cb3a6fa3988ff1955a82ebe708c62f32c8ff55a8e632e0455be053f75b6d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0f15c12784fe3757bb8675070938136dac4eeae1cad0996e74dfdc21b84248534884aa79dde6c5b1030f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,8 +499,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81a9077b89901fc7f8d55c21d035980bb3b860ff027e8557a60c538b7d0e3bc6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6338ac1fc9532f6a397227e9731cf970efef170be37b18ea82967880c4be4141",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -370,14 +525,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -422,10 +577,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideEnd_d0g0v0_Homestead" : {
+    "callcallcodecallcode_011_SuicideEnd_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/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,9 +592,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0x43e594b46a7b5aa61f512868a58a8c7abcb17602c503e5ff1fc958f9a8c19549",
-                    "mixHash" : "0x444aed557393497ade196cf5e100ef0468455f77ce915354ee1d9173803168c9",
-                    "nonce" : "0x7ca2b0f0eb6a7cbb",
+                    "hash" : "0x438859ac70ddab19e43a132aad2da4d14ca8ad9595c38d88a5e21c44cfad7545",
+                    "mixHash" : "0x94a0120b651c189d077a295a60663161640de73894542950d2b4391245011527",
+                    "nonce" : "0xb532d21e8a65a8e9",
                     "number" : "0x01",
                     "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
                     "receiptTrie" : "0x8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
@@ -448,7 +603,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0444aed557393497ade196cf5e100ef0468455f77ce915354ee1d9173803168c9887ca2b0f0eb6a7cbbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a094a0120b651c189d077a295a60663161640de73894542950d2b439124501152788b532d21e8a65a8e9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -485,8 +640,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43e594b46a7b5aa61f512868a58a8c7abcb17602c503e5ff1fc958f9a8c19549",
-        "network" : "Homestead",
+        "lastblockhash" : "0x438859ac70ddab19e43a132aad2da4d14ca8ad9595c38d88a5e21c44cfad7545",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -563,10 +718,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_011_SuicideEnd_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/stCallCodes/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -577,19 +732,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0xc75ac2210417e289c5cbafb1ebd0ba94d2a62e7776bb072dc2d30be2f8fa6f0c",
-                    "mixHash" : "0x788554fdcc4692858a0895da1db00bef95ce1a966648a1dc9aea012baf4f5c40",
-                    "nonce" : "0x245c24eb213bd85b",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0x21f385892074baf1284504ee6d52eb1bfa471574c5f014575ed0441e185916ad",
+                    "mixHash" : "0xc60ccac63ea40fe3d2293c14c7668c2abc13379f0a8c9e6a7ff6c7daaac6923d",
+                    "nonce" : "0x262735dbebaa8669",
                     "number" : "0x01",
                     "parentHash" : "0x6fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0x803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18c",
+                    "receiptTrie" : "0x8ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344c",
+                    "stateRoot" : "0x712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0803717ecac3d8a23c925e4efbd12f420561be6cf493b4b1e3d984dd1c5e1f18ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0788554fdcc4692858a0895da1db00bef95ce1a966648a1dc9aea012baf4f5c4088245c24eb213bd85bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06fa9d0663c9956cefa22d1313562bb18410dfecda274efec8107c32d460905e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0712ffd5cddbdb3cb44d8a8540433a7c94896ad85b7aab2b026e7329262d96d6da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08ac8f80f05fe0e5eb93c97d2337fc336282c2a255c6181136939803821c2344cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0c60ccac63ea40fe3d2293c14c7668c2abc13379f0a8c9e6a7ff6c7daaac6923d88262735dbebaa8669f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,16 +781,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87db5a520d36dbf8626014dfff5a58abf38f042e6ebcfe555a7490072c7e23ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc75ac2210417e289c5cbafb1ebd0ba94d2a62e7776bb072dc2d30be2f8fa6f0c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x21f385892074baf1284504ee6d52eb1bfa471574c5f014575ed0441e185916ad",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -659,14 +807,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
index 64a93c010..c3a60d393 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcallcodecallcode_011_SuicideMiddle_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/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x265af138fec75862d070af6185ebd8d44f2a1f54c7ed6d039be46665b936b3d7",
-                    "mixHash" : "0xd97fe8f7aadf197512e17bbad1704a7f0973b98e2fb716ac2a85dc168a9e213c",
-                    "nonce" : "0x833b8f04804ec457",
+                    "hash" : "0x71686d5114e234125d7563141177df72bc544667cc37780eba2c10dfe911d3f3",
+                    "mixHash" : "0x87f8e32228af8cb79f77389067b5559e8c4c1637af0191bb77ff52771664bed8",
+                    "nonce" : "0x2dffd0aef5d45059",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
-                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d97fe8f7aadf197512e17bbad1704a7f0973b98e2fb716ac2a85dc168a9e213c88833b8f04804ec457f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a087f8e32228af8cb79f77389067b5559e8c4c1637af0191bb77ff52771664bed8882dffd0aef5d45059f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x265af138fec75862d070af6185ebd8d44f2a1f54c7ed6d039be46665b936b3d7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x71686d5114e234125d7563141177df72bc544667cc37780eba2c10dfe911d3f3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -140,10 +147,158 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x31a9619f88cd057c41fbb7bc4c0dbbde20fe91a39c81a2addec06d16d630b46f",
+                    "mixHash" : "0xeb411691dc3a28f501a8f7bcb9ced7dc22aa5bf693cfd69eac6789214d06d426",
+                    "nonce" : "0x296f56e27e91be82",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0eb411691dc3a28f501a8f7bcb9ced7dc22aa5bf693cfd69eac6789214d06d42688296f56e27e91be82f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x31a9619f88cd057c41fbb7bc4c0dbbde20fe91a39c81a2addec06d16d630b46f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_SuicideMiddle_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/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -155,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xc4226c2a17df852f81e96df8cd74b87f91b3fde3f4dd72b11251a6d3b51b33a0",
-                    "mixHash" : "0x95f606d550c228f4b6b086cbd8e3d37bf7030542cc3dd7c25e85aeb114829ed6",
-                    "nonce" : "0x5a69d368bbaafda4",
+                    "hash" : "0xeb44907f101e28b1afaaa88326ab903d257d804945138a83f7cec34ea25a3428",
+                    "mixHash" : "0x6f9c6cf221bef474ca47302262ff4b6f074d55278a28200f42e646ab5542e4cd",
+                    "nonce" : "0xa0c59f0db066ee51",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
                     "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
@@ -166,7 +321,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a095f606d550c228f4b6b086cbd8e3d37bf7030542cc3dd7c25e85aeb114829ed6885a69d368bbaafda4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a06f9c6cf221bef474ca47302262ff4b6f074d55278a28200f42e646ab5542e4cd88a0c59f0db066ee51f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -203,8 +358,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4226c2a17df852f81e96df8cd74b87f91b3fde3f4dd72b11251a6d3b51b33a0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xeb44907f101e28b1afaaa88326ab903d257d804945138a83f7cec34ea25a3428",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -281,10 +436,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcallcodecallcode_011_SuicideMiddle_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/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -295,19 +450,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xf10fe20cdc6cc4a3333ea3b955a012fd091f68033464ddb2a535d603600a381d",
-                    "mixHash" : "0x15265ad22e293190b85231d206404855449b30727e2dfd0e71c12d27f9dea08d",
-                    "nonce" : "0x97d076e97bd4f224",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x947ae4042ce8deb5d834ca4751958472470c56cbf80dbeadcac28eef5c591de4",
+                    "mixHash" : "0xf2bce55ea59493d8d91dc1716cb66d2f9291d81fe69033ce72ec0800fdff3145",
+                    "nonce" : "0xe02a162521138eeb",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
-                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a015265ad22e293190b85231d206404855449b30727e2dfd0e71c12d27f9dea08d8897d076e97bd4f224f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f2bce55ea59493d8d91dc1716cb66d2f9291d81fe69033ce72ec0800fdff314588e02a162521138eebf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,8 +499,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf10fe20cdc6cc4a3333ea3b955a012fd091f68033464ddb2a535d603600a381d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x947ae4042ce8deb5d834ca4751958472470c56cbf80dbeadcac28eef5c591de4",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -370,14 +525,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -422,10 +577,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcallcodecallcode_011_SuicideMiddle_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/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,9 +592,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x8cb73591123e8393c10199e0207bf465d0137ecbf4acd49b156c3835915df8fa",
-                    "mixHash" : "0xb57f7a47a0c239e62c17955b8971065d32186f955915e989ae1402ced10a8bb9",
-                    "nonce" : "0x6fb90abc44769566",
+                    "hash" : "0x5e120db7f9014ffc040b655009afcd89d8c8398311ccbd06f14bbe1cce8175c1",
+                    "mixHash" : "0x5e6914a1643264b0f730a0cf45edffccf7f1cc46b2adc7fc84817a80fed116f2",
+                    "nonce" : "0x8ac9d0d65b967ee0",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
                     "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
@@ -448,7 +603,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0b57f7a47a0c239e62c17955b8971065d32186f955915e989ae1402ced10a8bb9886fb90abc44769566f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a05e6914a1643264b0f730a0cf45edffccf7f1cc46b2adc7fc84817a80fed116f2888ac9d0d65b967ee0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -485,8 +640,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8cb73591123e8393c10199e0207bf465d0137ecbf4acd49b156c3835915df8fa",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5e120db7f9014ffc040b655009afcd89d8c8398311ccbd06f14bbe1cce8175c1",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -563,10 +718,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_011_SuicideMiddle_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/stCallCodes/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -577,19 +732,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x444ca0e9cc5317dcbad3d098611db75ae3bd05674076e2d162ba120a822392b9",
-                    "mixHash" : "0x79ff578eff50c29324433eb20b8416032e0885a77e27926f6f9e0c637bedefaf",
-                    "nonce" : "0x8bf3875ea4fb6e36",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xa7cfa160e32393fb5d14d4adbaa581f846eaf13b3715e627fe2ca77410d7acc3",
+                    "mixHash" : "0xa0aea80567725f8eaa32c776c208a4a2b812d7a0c2b4f888a6bc037a6931c3a7",
+                    "nonce" : "0x5ab24f2b6a920718",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a079ff578eff50c29324433eb20b8416032e0885a77e27926f6f9e0c637bedefaf888bf3875ea4fb6e36f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0a0aea80567725f8eaa32c776c208a4a2b812d7a0c2b4f888a6bc037a6931c3a7885ab24f2b6a920718f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,16 +781,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x444ca0e9cc5317dcbad3d098611db75ae3bd05674076e2d162ba120a822392b9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa7cfa160e32393fb5d14d4adbaa581f846eaf13b3715e627fe2ca77410d7acc3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -659,14 +807,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_d0g0v0.json
index 6abe339c9..295b0020c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_011_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_011_d0g0v0_EIP150" : {
+    "callcallcodecallcode_011_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/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x83952b0d00bf32af8a6ca56af53e7f996d9552651f18f6cb19d04d856433fdb3",
-                    "mixHash" : "0xf995d4526143463cb8d1536785704bd714a09b341aad0837fe43823b8aac6cc2",
-                    "nonce" : "0x2f7a9c30ae7099cd",
+                    "hash" : "0xe26c1fdde6000e8cef3beffed30326e7cd9dc954bec869bf205dbaab61597edf",
+                    "mixHash" : "0x29230e99dcf4ef5f61669901be35bbb01c3c32d10e807dc1ede2559f5ca91fef",
+                    "nonce" : "0x43d929bf8bebdbfa",
                     "number" : "0x01",
                     "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "0xf30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
-                    "stateRoot" : "0x5239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8d",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xd8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0f995d4526143463cb8d1536785704bd714a09b341aad0837fe43823b8aac6cc2882f7a9c30ae7099cdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a029230e99dcf4ef5f61669901be35bbb01c3c32d10e807dc1ede2559f5ca91fef8843d929bf8bebdbfaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83952b0d00bf32af8a6ca56af53e7f996d9552651f18f6cb19d04d856433fdb3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe26c1fdde6000e8cef3beffed30326e7cd9dc954bec869bf205dbaab61597edf",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_d0g0v0_EIP158" : {
+    "callcallcodecallcode_011_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/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xb9614419e291b812c4c85963ec5b8286c07d3f6acc32c797c9b0802aaeff98f7",
-                    "mixHash" : "0xef1c37079cfa4c099cc8e61f3344a6ed660aa5f1e51bb803babcb1a88aadc135",
-                    "nonce" : "0x9070eac4e80eda64",
+                    "hash" : "0xcd91f585d5cfaee55d5f0800fc720bffa7547c791519545ff6e8b2c3c9c76c83",
+                    "mixHash" : "0x6a9467097428ae6dc4e096a4d4eae8e709d24907e2410a985749d38561d481db",
+                    "nonce" : "0xdcb4d8ca4465b7c5",
+                    "number" : "0x01",
+                    "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xd8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bf",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a06a9467097428ae6dc4e096a4d4eae8e709d24907e2410a985749d38561d481db88dcb4d8ca4465b7c5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcd91f585d5cfaee55d5f0800fc720bffa7547c791519545ff6e8b2c3c9c76c83",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640001",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x014a" : "0x1000000000000000000000000000000000000001",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000001",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x74418e474509350821cd8ca851d3ac0de695e3dac97fb8c02230b29b38616479",
+                    "mixHash" : "0x29277c0be1eb28b4160154cb524f6146509c45537543ec6e08b297996a5655cf",
+                    "nonce" : "0xdcabf4a9fbef5bcc",
                     "number" : "0x01",
                     "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
                     "receiptTrie" : "0xf30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0ef1c37079cfa4c099cc8e61f3344a6ed660aa5f1e51bb803babcb1a88aadc135889070eac4e80eda64f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a029277c0be1eb28b4160154cb524f6146509c45537543ec6e08b297996a5655cf88dcabf4a9fbef5bccf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9614419e291b812c4c85963ec5b8286c07d3f6acc32c797c9b0802aaeff98f7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x74418e474509350821cd8ca851d3ac0de695e3dac97fb8c02230b29b38616479",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_d0g0v0_Frontier" : {
+    "callcallcodecallcode_011_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/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0xdfd2b8e043e43fb06b1c0ccac4b30eb0a0275e514a191dd9ea8441e3f8feff05",
-                    "mixHash" : "0x8060beb661f1899b2dcebdd55d28d8642f8ff7b64ef1ea453b4ee8f373cf22db",
-                    "nonce" : "0xea02549500052f3c",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x9ed64ab91e004ede0edbcdcc6e5719a598d7d8aa214f03d2fb512ce4eb7e3ec6",
+                    "mixHash" : "0x3fb29abfdb92384d8ca9f6a5a13840d3c8d0c28ddc7d22d904decf834041f6b1",
+                    "nonce" : "0x991e0f8dbb3b74aa",
                     "number" : "0x01",
                     "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "0xec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
-                    "stateRoot" : "0x63c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5",
+                    "receiptTrie" : "0xf30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfb",
+                    "stateRoot" : "0x5239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a08060beb661f1899b2dcebdd55d28d8642f8ff7b64ef1ea453b4ee8f373cf22db88ea02549500052f3cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05239a49d0739ca7f66a76ed1821c5d321800606aa139787ee25ec521a4a81c8da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f30a45b5d1dbd855ea3959fea5b45818688b0dca4f44e22344b7c70c3c7a2cfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a03fb29abfdb92384d8ca9f6a5a13840d3c8d0c28ddc7d22d904decf834041f6b188991e0f8dbb3b74aaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfd2b8e043e43fb06b1c0ccac4b30eb0a0275e514a191dd9ea8441e3f8feff05",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9ed64ab91e004ede0edbcdcc6e5719a598d7d8aa214f03d2fb512ce4eb7e3ec6",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_d0g0v0_Homestead" : {
+    "callcallcodecallcode_011_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/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0x3017b64c810cb3e5603e05bf0d6c62e09f71672f2b30cc2d8f5329ba661d75b3",
-                    "mixHash" : "0x8a9e89634dbbff3c07374952ea234c62cfce36e3312b6c6ebce5cbb1397eee93",
-                    "nonce" : "0xf3562fb9bd94cf19",
+                    "hash" : "0x4f2860a49d2697a386b11d63ec0b7253044a42439a1fefd1178666e741210b3a",
+                    "mixHash" : "0xa901a14042080d430a12a8b166d404c35fdb4e1bf0b8298ed254b9205214cdee",
+                    "nonce" : "0x9deaeae0d6568933",
                     "number" : "0x01",
                     "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
                     "receiptTrie" : "0xec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a08a9e89634dbbff3c07374952ea234c62cfce36e3312b6c6ebce5cbb1397eee9388f3562fb9bd94cf19f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0a901a14042080d430a12a8b166d404c35fdb4e1bf0b8298ed254b9205214cdee889deaeae0d6568933f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3017b64c810cb3e5603e05bf0d6c62e09f71672f2b30cc2d8f5329ba661d75b3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4f2860a49d2697a386b11d63ec0b7253044a42439a1fefd1178666e741210b3a",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcallcodecallcode_011_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_011_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/stCallCodes/callcallcodecallcode_011_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0xa18f31cda36a787b97352c917d68097b42b20cd7922699bf60fc2495fcff23d9",
-                    "mixHash" : "0xda7eb6d1f904a205d1eb996ceed44579472dd31dc2be113f7955022071c0977d",
-                    "nonce" : "0xc4c81099f27aa218",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0xb75f3834151b5c9854cb55b2db79d17f87ffe97abe70691c2c1982c5fd4a5b08",
+                    "mixHash" : "0xba7d80b959eb3ca3fefe96c4474844b0a1a91d511d8635430d674605f534c5fb",
+                    "nonce" : "0x934ecd97ebe56612",
                     "number" : "0x01",
                     "parentHash" : "0x6598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0xd8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bf",
+                    "receiptTrie" : "0xec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5",
+                    "stateRoot" : "0x63c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8fb01948c728f4cba827b3fca599f54867f7bc0cb1ce060c5b4722f6cbf48bfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0da7eb6d1f904a205d1eb996ceed44579472dd31dc2be113f7955022071c0977d88c4c81099f27aa218f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06598ede78bd63981e999f711376c3a93d397ae8fe246573f8dde6edea63e09a0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c713218f4d7c62fe3b98bac70c1d0626a0f4ace1fc227801143845014823a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec1868396531e1fbd45ba1648747743823f6906ed6749e9a55fd694b54a0a5f5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0ba7d80b959eb3ca3fefe96c4474844b0a1a91d511d8635430d674605f534c5fb88934ecd97ebe56612f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d68672c2a76837125043a3efcc70dd7d51135b01d601a604dc02a2de78faa9fba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa18f31cda36a787b97352c917d68097b42b20cd7922699bf60fc2495fcff23d9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb75f3834151b5c9854cb55b2db79d17f87ffe97abe70691c2c1982c5fd4a5b08",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
index f77eadf9c..43bb54195 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xffe643c7a328a2385b6297d96c7019cafe0c841ef15f08d497474a2aefca6c65",
-                    "mixHash" : "0xb69039a0d6a3a978a4faaeb9a95d8a937bd55a56e8d22379dd62c792c428e2cd",
-                    "nonce" : "0xa009b3a07c27718e",
+                    "hash" : "0x2ff8fb9d8cff2dfae06f3ca45489f548ea4b245803c291cd5fc576264817af17",
+                    "mixHash" : "0xcd9d9f9711e78498cb10305f1420ae4fafc567d997acb2a31d530393ee8c2d72",
+                    "nonce" : "0x009ba37ca7b8c043",
                     "number" : "0x01",
                     "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "0xf52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
-                    "stateRoot" : "0x98aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0b69039a0d6a3a978a4faaeb9a95d8a937bd55a56e8d22379dd62c792c428e2cd88a009b3a07c27718ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0cd9d9f9711e78498cb10305f1420ae4fafc567d997acb2a31d530393ee8c2d7288009ba37ca7b8c043f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffe643c7a328a2385b6297d96c7019cafe0c841ef15f08d497474a2aefca6c65",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2ff8fb9d8cff2dfae06f3ca45489f548ea4b245803c291cd5fc576264817af17",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x4f88110471eeeb20694981744b4cc40f43319f10e937aebea8dd03bee6e47e1e",
+                    "mixHash" : "0x66222165e22c167ebe527b6e04884701a7d14209753ea59188d63c23adfe2bbc",
+                    "nonce" : "0x8be6f1dfd3af827f",
+                    "number" : "0x01",
+                    "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a066222165e22c167ebe527b6e04884701a7d14209753ea59188d63c23adfe2bbc888be6f1dfd3af827ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f88110471eeeb20694981744b4cc40f43319f10e937aebea8dd03bee6e47e1e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xf6245919304422aee3b89f89333a47f60eedc2cdace048d4033824ca83da74df",
-                    "mixHash" : "0xe054b7ca27f877c9d2f4e034049883a3e934ae92381aabde1dced4f009230f20",
-                    "nonce" : "0x5eb4dfe9d1438a7d",
+                    "hash" : "0x3a2c5fdbbee3160f2994551bbec9f422b2388fd0ea243c6e43e4ecec4bb3e0ab",
+                    "mixHash" : "0xeb280311ae593de791010be835977d817ae77404bf7cb60dcdd14635ae7b6bff",
+                    "nonce" : "0xefaa991ea3f68323",
                     "number" : "0x01",
                     "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
                     "receiptTrie" : "0xf52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0e054b7ca27f877c9d2f4e034049883a3e934ae92381aabde1dced4f009230f20885eb4dfe9d1438a7df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0eb280311ae593de791010be835977d817ae77404bf7cb60dcdd14635ae7b6bff88efaa991ea3f68323f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6245919304422aee3b89f89333a47f60eedc2cdace048d4033824ca83da74df",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3a2c5fdbbee3160f2994551bbec9f422b2388fd0ea243c6e43e4ecec4bb3e0ab",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0x20bf51da65426b3b82bad42d3eeb171132e61eba9e12e9275dda314d91f4a9d5",
-                    "mixHash" : "0xa79e6c668e4aed242dd0493dd7d642ebb3150a00ccb7ac98a33d79e1acdd606a",
-                    "nonce" : "0xb19eaf630ab65fec",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x0507c8598b0ca2806a2519dea8d2de9c9ed74c5792c8df1508175db03b8561bb",
+                    "mixHash" : "0x6bce31cc9fc8873967d9a7f6e4511cd81cea0cc978b4f2af4ac18a33b33ea70d",
+                    "nonce" : "0x59c0d759b136cd51",
                     "number" : "0x01",
                     "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "0x9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
-                    "stateRoot" : "0xb87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966",
+                    "receiptTrie" : "0xf52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90a",
+                    "stateRoot" : "0x98aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0a79e6c668e4aed242dd0493dd7d642ebb3150a00ccb7ac98a33d79e1acdd606a88b19eaf630ab65fecf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098aecff1cb9e0e77919694fc4efa5e8beb212894f7e87765496ba6455543ba62a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f52f9578c5e5805fa8c001aa8b2c0dfd49635fd73479f8b06d71b628a613c90ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06bce31cc9fc8873967d9a7f6e4511cd81cea0cc978b4f2af4ac18a33b33ea70d8859c0d759b136cd51f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20bf51da65426b3b82bad42d3eeb171132e61eba9e12e9275dda314d91f4a9d5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0507c8598b0ca2806a2519dea8d2de9c9ed74c5792c8df1508175db03b8561bb",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x5fa70ce7ffed49d99f52f58a3e17d088ece201e4be2afc04a4103de54defd446",
-                    "mixHash" : "0xc1710818d555f5edcaf3e36b19248e2625c77c6b8ffaefef092771cb9ffcb55a",
-                    "nonce" : "0x557217f69e8e9c90",
+                    "hash" : "0x7ec05e4817a2d4c8a55125f6133f95238834f4b81381d6799bf0eae79610c2d2",
+                    "mixHash" : "0x7f1a4c99c06b0c4b05218536c036de283b45e3a9b9fb87d6a486c54fc65f56d8",
+                    "nonce" : "0xa7cd8a72b6353ca6",
                     "number" : "0x01",
                     "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
                     "receiptTrie" : "0x9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0c1710818d555f5edcaf3e36b19248e2625c77c6b8ffaefef092771cb9ffcb55a88557217f69e8e9c90f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a07f1a4c99c06b0c4b05218536c036de283b45e3a9b9fb87d6a486c54fc65f56d888a7cd8a72b6353ca6f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fa70ce7ffed49d99f52f58a3e17d088ece201e4be2afc04a4103de54defd446",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7ec05e4817a2d4c8a55125f6133f95238834f4b81381d6799bf0eae79610c2d2",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcallcodecallcode_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0xbb65453a83106fa4ea0c6e7c668c7f94f7e4aea47f5d5b858b26c5a813d378dd",
-                    "mixHash" : "0x85980e88e84c570c39736c539134391f8e0c99226868734f6ae6fb8fa14a6024",
-                    "nonce" : "0x19424357ea11b596",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0xeac26f5fab7bfe924649348660b2e883b4e3d6e9443f0705ce5b9c4b293d9f26",
+                    "mixHash" : "0x3494091cb762b4f6c45c03fc330e55eca077c39d39b251d9315d241c4fe826b7",
+                    "nonce" : "0x262233be63632e71",
                     "number" : "0x01",
                     "parentHash" : "0x2c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0x984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609",
+                    "receiptTrie" : "0x9dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765a",
+                    "stateRoot" : "0xb87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0984df308e04177bef7b46b0ec5dec320e36dbef9040603228489cd55e24c1609a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a085980e88e84c570c39736c539134391f8e0c99226868734f6ae6fb8fa14a60248819424357ea11b596f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a02c98a1d1132f91f236b08f309fc0954969c4949f75cfc7341e9fce135c923390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b87f088006c2e05780960fe2ec9706ad70870ed58e7c48dd9bac154d79e72966a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a09dc3c471d545a0786f6e477f612577f69e23c19b3690b5bbf07e8bd21168765ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a03494091cb762b4f6c45c03fc330e55eca077c39d39b251d9315d241c4fe826b788262233be63632e71f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e25de8c06d98fce6a69a4acb9eba36d8cfcbc5f9e1022f0bc6796977f4db2525a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb65453a83106fa4ea0c6e7c668c7f94f7e4aea47f5d5b858b26c5a813d378dd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xeac26f5fab7bfe924649348660b2e883b4e3d6e9443f0705ce5b9c4b293d9f26",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0.json
index bb8c3aa1f..dea96a75b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeDynamicCode2SelfCall_d0g0v0_EIP150" : {
+    "callcodeDynamicCode2SelfCall_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/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e48",
-                    "hash" : "0xff51a4af11fc85b912a66a12176de31fe6cbf5067f00ec4a11a5fd442019b76d",
-                    "mixHash" : "0x43bcdc908e80010f6adba8b7d6fb893e5935692e25d535389702ed14761ef0a8",
-                    "nonce" : "0x7babec8fd52232b7",
+                    "hash" : "0x5508777318893297e021f8a37ead07dbb2b59d5adf7047dfbcd5749b57a88ae5",
+                    "mixHash" : "0xd733fb9e279f82efc80efe248aab63142dcc6070ea069a60ddcdaab0c124e503",
+                    "nonce" : "0x9a744a5072cf2a96",
                     "number" : "0x01",
                     "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "0x918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6",
-                    "stateRoot" : "0x35fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331",
+                    "receiptTrie" : "0xd55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073",
+                    "stateRoot" : "0xceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a043bcdc908e80010f6adba8b7d6fb893e5935692e25d535389702ed14761ef0a8887babec8fd52232b7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a0d733fb9e279f82efc80efe248aab63142dcc6070ea069a60ddcdaab0c124e503889a744a5072cf2a96f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff51a4af11fc85b912a66a12176de31fe6cbf5067f00ec4a11a5fd442019b76d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5508777318893297e021f8a37ead07dbb2b59d5adf7047dfbcd5749b57a88ae5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
@@ -113,10 +120,10 @@
             }
         }
     },
-    "callcodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
+    "callcodeDynamicCode2SelfCall_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/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e48",
-                    "hash" : "0x68b09c877b256f31eb2b12dad52bf2649896ffe1c3e0ad23b3efdb2201c948f2",
-                    "mixHash" : "0x0ca110a3e846f7866e7b521eee2917e310deeb844c7897d478ef31ce1e19bc9e",
-                    "nonce" : "0x6c9b4f2bb3673479",
+                    "hash" : "0xb8102be5df34e4e215bfea38099f72f86dad57d3adbdd4ae3e91c3222b144239",
+                    "mixHash" : "0x2a55f6aa917eb9c3a7a2a38635cdec2ff155b33d727a4b6bd7aa92650b97fb95",
+                    "nonce" : "0x99c4b0195ad904f2",
                     "number" : "0x01",
                     "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "0xf0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58a",
-                    "stateRoot" : "0xac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5b",
+                    "receiptTrie" : "0xd55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073",
+                    "stateRoot" : "0xceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a00ca110a3e846f7866e7b521eee2917e310deeb844c7897d478ef31ce1e19bc9e886c9b4f2bb3673479f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a02a55f6aa917eb9c3a7a2a38635cdec2ff155b33d727a4b6bd7aa92650b97fb958899c4b0195ad904f2f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68b09c877b256f31eb2b12dad52bf2649896ffe1c3e0ad23b3efdb2201c948f2",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb8102be5df34e4e215bfea38099f72f86dad57d3adbdd4ae3e91c3222b144239",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "callcodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
+    "callcodeDynamicCode2SelfCall_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/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016bb4",
-                    "hash" : "0x57f4ae857fd6ff74b424f434375abf415fa093f0c0724f84ddce76e0d4c44ef4",
-                    "mixHash" : "0x4ea72ac49a5004602ac883bdea57d11b3c318c3f81daf296aee96cf2abb58cbf",
-                    "nonce" : "0x8347065fa04984f0",
+                    "gasUsed" : "0x016e48",
+                    "hash" : "0x6adee10c56b8b38607456475066d4a5f00b8cf4cb14b976790f8fdb23955b9e4",
+                    "mixHash" : "0x50dadf558cfeb4ed0e3e01f78d34c99b08757e2781eb21c6ceae1e5330719efe",
+                    "nonce" : "0x4a854dfa64a5c2ec",
                     "number" : "0x01",
                     "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "0x9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
-                    "stateRoot" : "0x01012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477",
+                    "receiptTrie" : "0x918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6",
+                    "stateRoot" : "0x35fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a04ea72ac49a5004602ac883bdea57d11b3c318c3f81daf296aee96cf2abb58cbf888347065fa04984f0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035fd6ed99d98ffd10feff25a58cdb45565d1186af5cac9ea4457889d58ddf331a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0918cdb7d4b07f2d65d39b34f50662603527deafc3e17028e56f41537ff7121b6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a050dadf558cfeb4ed0e3e01f78d34c99b08757e2781eb21c6ceae1e5330719efe884a854dfa64a5c2ecf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57f4ae857fd6ff74b424f434375abf415fa093f0c0724f84ddce76e0d4c44ef4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6adee10c56b8b38607456475066d4a5f00b8cf4cb14b976790f8fdb23955b9e4",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -310,14 +324,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56bb4",
+                "balance" : "0x4563918244f56e48",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf944c",
+                "balance" : "0x2386f26fbf91b8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -341,10 +355,124 @@
             }
         }
     },
-    "callcodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
+    "callcodeDynamicCode2SelfCall_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/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x016e48",
+                    "hash" : "0xc75750092643f1fc9202118370b1a256fc81e23b6310709cbc8c8d0b9fd8e3fc",
+                    "mixHash" : "0x1769729ec7ade364055f67f6125b107577e066e379f2450f8ebcb1579da5b13d",
+                    "nonce" : "0x67e4091fc1d91386",
+                    "number" : "0x01",
+                    "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+                    "receiptTrie" : "0xf0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58a",
+                    "stateRoot" : "0xac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2fd109317958259b7c054ae1334fcbd38f88a1b5d396c77c6af92f6afcef5ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f0bac29143ab50e11d47898c5774b1678d00f06374483ccb768609f52c6ac58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a01769729ec7ade364055f67f6125b107577e066e379f2450f8ebcb1579da5b13d8867e4091fc1d91386f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc75750092643f1fc9202118370b1a256fc81e23b6310709cbc8c8d0b9fd8e3fc",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x0b" : "0x01",
+                    "0x0c" : "0x1000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56e48",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf91b8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,9 +484,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb4",
-                    "hash" : "0x9bd845e77a8c96915649885112c704b07195d2bed949b4f342a8f36ea74ee8b4",
-                    "mixHash" : "0x046ca26ca442f6dce2ffa32fe8f65d039b020d275d6bc23974c6e398a694c5d6",
-                    "nonce" : "0x25322ee8df0fa372",
+                    "hash" : "0xda4c0a726a3b7d8565e9360d6a44e648df2968db6f9c273aab4c188d139ba2dc",
+                    "mixHash" : "0x3432089635c561db60c61752a10dd69899e8e0626992e6535f0e4cbd63b1cfb0",
+                    "nonce" : "0xd042c0664ef0fe6e",
                     "number" : "0x01",
                     "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
                     "receiptTrie" : "0x9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
@@ -367,7 +495,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a0046ca26ca442f6dce2ffa32fe8f65d039b020d275d6bc23974c6e398a694c5d68825322ee8df0fa372f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a03432089635c561db60c61752a10dd69899e8e0626992e6535f0e4cbd63b1cfb088d042c0664ef0fe6ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +532,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bd845e77a8c96915649885112c704b07195d2bed949b4f342a8f36ea74ee8b4",
-        "network" : "Homestead",
+        "lastblockhash" : "0xda4c0a726a3b7d8565e9360d6a44e648df2968db6f9c273aab4c188d139ba2dc",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -455,10 +583,10 @@
             }
         }
     },
-    "callcodeDynamicCode2SelfCall_d0g0v0_Metropolis" : {
+    "callcodeDynamicCode2SelfCall_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/stCallCodes/callcodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -469,19 +597,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e48",
-                    "hash" : "0x8c6c5ea5fdc41f0f75b7d1b3e7e1a3deeb888fd91d64408055ea641c92f27087",
-                    "mixHash" : "0x59f9a69111dd5d8e00f68df691d3bfcf7cb0c0b071e7a8ec298e05251341f9c7",
-                    "nonce" : "0x71fb12c44f7a089c",
+                    "gasUsed" : "0x016bb4",
+                    "hash" : "0xbf083468ccc7aa2d7743b0d1227ff92e5428e7283252cf0677e76397437a06ff",
+                    "mixHash" : "0x931851c2df14737d514d81c7d5ab97457b5d2876ec70b97a1d82780043da6199",
+                    "nonce" : "0xecfa6afb0b94f1ee",
                     "number" : "0x01",
                     "parentHash" : "0xac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148",
-                    "receiptTrie" : "0xd55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073",
-                    "stateRoot" : "0xceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099",
+                    "receiptTrie" : "0x9a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4",
+                    "stateRoot" : "0x01012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceed895cec6abc7c758f1ef80ca016c65b7c460e21702de5f3bf33f34bdfb099a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d55bcfdfc833b80a76f004e2763d06bdec5b3536fba13adcfa0495b4dc5f4073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e488203e880a059f9a69111dd5d8e00f68df691d3bfcf7cb0c0b071e7a8ec298e05251341f9c78871fb12c44f7a089cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0ac4c921a5bc365d8ee3eeae5366a615ada88850d4b2ac5952aac3a50aa607148a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001012d8fa832a7e7bbe7837fe1251c79424cac212ed1e96eaf84cd6f3b42d477a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a09a61f29def895e691bbb86381fedc4e377dff19876e4485d51f58cea95f6e9b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb48203e880a0931851c2df14737d514d81c7d5ab97457b5d2876ec70b97a1d82780043da619988ecfa6afb0b94f1eef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,16 +646,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3cf5c73d59cb03fa004d9f8aa3d3c009dff3a976452f4b2a68697a34f203db2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c6c5ea5fdc41f0f75b7d1b3e7e1a3deeb888fd91d64408055ea641c92f27087",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbf083468ccc7aa2d7743b0d1227ff92e5428e7283252cf0677e76397437a06ff",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
@@ -538,21 +659,21 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e48",
+                "balance" : "0x4563918244f56bb4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91b8",
+                "balance" : "0x2386f26fbf944c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json
index 2d79ec861..61b70f01f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeDynamicCode_d0g0v0_EIP150" : {
+    "callcodeDynamicCode_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/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x028ec9",
-                    "hash" : "0x72a967e936e15a4bc73ef6fb0d08bad78720e4877c9809df49cbab99162201c7",
-                    "mixHash" : "0x3841c6077fc31a71bafaf41d88a7ed8e361af89a50ab97b4fecf13aae5bcbb5a",
-                    "nonce" : "0x69e382e6807d305f",
+                    "gasUsed" : "0x01f27e",
+                    "hash" : "0x78c3435e60f7e7a9f48062d37a2cc7e7d0cd26fa20fdde345d26acbcda03459c",
+                    "mixHash" : "0xebc7e31d0e5184f87b58dbbf5de5b2d9d5d36eaba80b66280c59f2b42e5f0e65",
+                    "nonce" : "0x209c019d10eae61d",
                     "number" : "0x01",
                     "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "0x1411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20",
-                    "stateRoot" : "0x4b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442d",
+                    "receiptTrie" : "0x558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38b",
+                    "stateRoot" : "0xb6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a01411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec98203e880a03841c6077fc31a71bafaf41d88a7ed8e361af89a50ab97b4fecf13aae5bcbb5a8869e382e6807d305ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a0ebc7e31d0e5184f87b58dbbf5de5b2d9d5d36eaba80b66280c59f2b42e5f0e6588209c019d10eae61df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72a967e936e15a4bc73ef6fb0d08bad78720e4877c9809df49cbab99162201c7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x78c3435e60f7e7a9f48062d37a2cc7e7d0cd26fa20fdde345d26acbcda03459c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -82,32 +89,30 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x02",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
-                    "0x0b" : "0x01",
-                    "0x14" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
+                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                    "0x0b" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68ec9",
+                "balance" : "0x4563918244f5f27e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbe7137",
-                "code" : "",
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
-                "balance" : "0x01",
-                "code" : "0x600160005533601455",
-                "nonce" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf0d82",
+                "code" : "",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -136,10 +141,10 @@
             }
         }
     },
-    "callcodeDynamicCode_d0g0v0_EIP158" : {
+    "callcodeDynamicCode_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/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -151,18 +156,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27e",
-                    "hash" : "0x2ae51b3340fc9db732d9af0a82d326fa53047129b7b4beeb0c09677c23735eb2",
-                    "mixHash" : "0x1cb74a22dcc8990f82679b568450b9cee3816115761ef68df191f87b81951190",
-                    "nonce" : "0x1f03b9e2feec55b0",
+                    "hash" : "0x1285283f8b5dbbe5a07c2a7960ee4d87add53a2eeb383215218daf1948aa1b72",
+                    "mixHash" : "0xe0a75691a84efe4bfac4e08c047d9b6f14721997dbeab25ab5401e6cf5e45c45",
+                    "nonce" : "0x0a7a2a33f0756092",
                     "number" : "0x01",
                     "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "0x77058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9",
-                    "stateRoot" : "0xace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620",
+                    "receiptTrie" : "0x558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38b",
+                    "stateRoot" : "0xb6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a077058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a01cb74a22dcc8990f82679b568450b9cee3816115761ef68df191f87b81951190881f03b9e2feec55b0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a0e0a75691a84efe4bfac4e08c047d9b6f14721997dbeab25ab5401e6cf5e45c45880a7a2a33f0756092f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -199,9 +204,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ae51b3340fc9db732d9af0a82d326fa53047129b7b4beeb0c09677c23735eb2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1285283f8b5dbbe5a07c2a7960ee4d87add53a2eeb383215218daf1948aa1b72",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -271,10 +283,10 @@
             }
         }
     },
-    "callcodeDynamicCode_d0g0v0_Frontier" : {
+    "callcodeDynamicCode_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/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -285,19 +297,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x028c35",
-                    "hash" : "0x9b1523080256cc0ccdb71e88489f3a94fc01c6084b6a08251702c0d10fc0c48d",
-                    "mixHash" : "0xdea45d38b27dcf69c4cecb9e103bd078a6611f3b5a3befd351657668eaab7007",
-                    "nonce" : "0x14ca41d5f3c8ed40",
+                    "gasUsed" : "0x028ec9",
+                    "hash" : "0x0b48417b1cefc7db4917b5573508dc077c859275766978511f65f2a0facffe98",
+                    "mixHash" : "0x5da02a408f4f32c5b6814705e7b5d3f96d93a57728bfd2118810a75bb8109cc6",
+                    "nonce" : "0xbfa4b12d97d58a77",
                     "number" : "0x01",
                     "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "0x7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
-                    "stateRoot" : "0xb2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fd",
+                    "receiptTrie" : "0x1411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20",
+                    "stateRoot" : "0x4b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a0dea45d38b27dcf69c4cecb9e103bd078a6611f3b5a3befd351657668eaab70078814ca41d5f3c8ed40f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4926daa94461926cefcc56f180a7c06b5ae55be11e116dfebb12bc932d442da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a01411a5917604fce1b80e269bdf13e4bdca7aeb97603b7ddfa0b0af6422966a20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec98203e880a05da02a408f4f32c5b6814705e7b5d3f96d93a57728bfd2118810a75bb8109cc688bfa4b12d97d58a77f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -334,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b1523080256cc0ccdb71e88489f3a94fc01c6084b6a08251702c0d10fc0c48d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0b48417b1cefc7db4917b5573508dc077c859275766978511f65f2a0facffe98",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -363,14 +375,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68c35",
+                "balance" : "0x4563918244f68ec9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbe73cb",
+                "balance" : "0x2386f26fbe7137",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -408,10 +420,145 @@
             }
         }
     },
-    "callcodeDynamicCode_d0g0v0_Homestead" : {
+    "callcodeDynamicCode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01f27e",
+                    "hash" : "0x11533c49d14973d5721969717853adccd63e184fc7322a96b4862b66467a93f4",
+                    "mixHash" : "0xa671dd178e0ac31e2666ff59be41927de7997c09e49f490062c6674f3b4cb0d3",
+                    "nonce" : "0x03b3d183c66e119c",
+                    "number" : "0x01",
+                    "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+                    "receiptTrie" : "0x77058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9",
+                    "stateRoot" : "0xace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ace633cd2ae2c84533298d0c1a82a8d476d5b6d560e6d9ecdf33fdae2eaba620a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a077058097a8d016ca6deedd68f45a2fee16a2ed65889f8cecac12e7f9046a3ae9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a0a671dd178e0ac31e2666ff59be41927de7997c09e49f490062c6674f3b4cb0d38803b3d183c66e119cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x11533c49d14973d5721969717853adccd63e184fc7322a96b4862b66467a93f4",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                    "0x0b" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f27e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf0d82",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeDynamicCode_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/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -423,9 +570,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c35",
-                    "hash" : "0x46d413466c2b1276d03770533da873ace2410e90bc0384303ff401a033a73e19",
-                    "mixHash" : "0x82525414b5cdd52c824fc281e0a55d4613ad3d2d1b4def552f47e60a6766b74a",
-                    "nonce" : "0xcc3460ab41920efd",
+                    "hash" : "0xf93b83624c38e323e919288c674cdc4d349cf3eed1ebaa04280b9c828ac5403c",
+                    "mixHash" : "0x346137af729719c35b0ec7261955b3e46ac9ade9a5137eba76d8db04166b4f6e",
+                    "nonce" : "0x27bb83823fa71c02",
                     "number" : "0x01",
                     "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
                     "receiptTrie" : "0x7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
@@ -434,7 +581,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a082525414b5cdd52c824fc281e0a55d4613ad3d2d1b4def552f47e60a6766b74a88cc3460ab41920efdf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a0346137af729719c35b0ec7261955b3e46ac9ade9a5137eba76d8db04166b4f6e8827bb83823fa71c02f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -471,8 +618,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46d413466c2b1276d03770533da873ace2410e90bc0384303ff401a033a73e19",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf93b83624c38e323e919288c674cdc4d349cf3eed1ebaa04280b9c828ac5403c",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -545,10 +692,10 @@
             }
         }
     },
-    "callcodeDynamicCode_d0g0v0_Metropolis" : {
+    "callcodeDynamicCode_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/stCallCodes/callcodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -559,19 +706,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01f27e",
-                    "hash" : "0x38c493ab38656fdef7c2449bed548a11e0c9c9e21e0d6209806215aafb60aaeb",
-                    "mixHash" : "0x065f9b7c312a5c1e2ce0059d474424a8e4095114208e706ad283aa3efa14db74",
-                    "nonce" : "0xd55db8ef3a06f8a9",
+                    "gasUsed" : "0x028c35",
+                    "hash" : "0x0c85f3116a334afa78c3f09f8c3b0c07fec680d18af4c26ffddfeda0d008c666",
+                    "mixHash" : "0x8a61ff7eb2e87a89b2b675483bdd3d48e4e7e02e9dc137d72ab45c332fcebcfe",
+                    "nonce" : "0x21e8d37c5b71bc37",
                     "number" : "0x01",
                     "parentHash" : "0xb81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262",
-                    "receiptTrie" : "0x558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38b",
-                    "stateRoot" : "0xb6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490",
+                    "receiptTrie" : "0x7630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bb",
+                    "stateRoot" : "0xb2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6fa80fa32b3624877ce53258cbd720dd2c84b7b090e4087c28b0cc2d90fb490a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0558bb60fd8611e8bbdad9f5c7a1412cf3ee0dad8249599dc78b5d621deebb38bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27e8203e880a0065f9b7c312a5c1e2ce0059d474424a8e4095114208e706ad283aa3efa14db7488d55db8ef3a06f8a9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0b81c9ce7471cc9796ba701088bc27293d4e579b2a03ce8057e6504c736a48262a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2130a284e009216b1971be811447e4c9a9682c973cf3c9ec322a198053cc1fda074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07630940fd6dcbb4b665c966bb805b8bd2727eae0f363343114be5984a0a316bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c358203e880a08a61ff7eb2e87a89b2b675483bdd3d48e4e7e02e9dc137d72ab45c332fcebcfe8821e8d37c5b71bc37f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -608,16 +755,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc77f786d486703dea35efbf2468ff7b1c252322e8d47e848db0231e2254316a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38c493ab38656fdef7c2449bed548a11e0c9c9e21e0d6209806215aafb60aaeb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0c85f3116a334afa78c3f09f8c3b0c07fec680d18af4c26ffddfeda0d008c666",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -635,30 +775,32 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x02",
+                "nonce" : "0x01",
                 "storage" : {
-                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
-                    "0x0b" : "0x01"
+                    "0x00" : "0x01",
+                    "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
+                    "0x0b" : "0x01",
+                    "0x14" : "0x13136008b64ff592819b2fa6d43f2835c452020e"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f27e",
+                "balance" : "0x4563918244f68c35",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
-                "balance" : "0x01",
-                "code" : "0x600160005533601455",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbe73cb",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf0d82",
-                "code" : "",
-                "nonce" : "0x01",
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract_d0g0v0.json
index 5ac76cda8..6b9a09640 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeEmptycontract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeEmptycontract_d0g0v0_EIP150" : {
+    "callcodeEmptycontract_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/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xbd2e",
-                    "hash" : "0xc268100e3becc9ea07612d353adbaf83cda7c64010c158559ef89168cdb101b3",
-                    "mixHash" : "0x3352cc5a612a6273ffc0780e280b77388c65e3fef8e61e58d766c687a73d652a",
-                    "nonce" : "0x7115a34e9162e37f",
+                    "hash" : "0x686fbee26d4bd86ad1a1b032feba7442ec3299cec8ca945a79fed0ff7e4733e6",
+                    "mixHash" : "0x5d932d9d78d43ab6f90620b0d757578bccfcaec47ce08a5e5210ab04fb27f400",
+                    "nonce" : "0x1a2130fc4e8a8a3e",
                     "number" : "0x01",
                     "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "0xd0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
-                    "stateRoot" : "0x53e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942",
+                    "receiptTrie" : "0x5514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97",
+                    "stateRoot" : "0x6a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a03352cc5a612a6273ffc0780e280b77388c65e3fef8e61e58d766c687a73d652a887115a34e9162e37ff862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba05514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a05d932d9d78d43ab6f90620b0d757578bccfcaec47ce08a5e5210ab04fb27f400881a2130fc4e8a8a3ef862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc268100e3becc9ea07612d353adbaf83cda7c64010c158559ef89168cdb101b3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x686fbee26d4bd86ad1a1b032feba7442ec3299cec8ca945a79fed0ff7e4733e6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "callcodeEmptycontract_d0g0v0_EIP158" : {
+    "callcodeEmptycontract_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/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xbd2e",
-                    "hash" : "0x180881212a9a3123b511415af0368fee8bdcddd91d95a9b8f07b4bcfa67aa633",
-                    "mixHash" : "0xadaa6ba3037f336d2b177bb3c7eefcf224721b1ed033f32cd88da57a9428fe79",
-                    "nonce" : "0xfec83f5bce725708",
+                    "hash" : "0xd944e75ab3d238d0f227b4cb553459393c049fa367bf7da652c36467bf3b8f53",
+                    "mixHash" : "0xf7db0d11faeea987303d229b2d3a80959d403a05d5c1a3b4ccb7702a7ceb1fc8",
+                    "nonce" : "0x5fac35ed72e01fed",
+                    "number" : "0x01",
+                    "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+                    "receiptTrie" : "0x5514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97",
+                    "stateRoot" : "0x6a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba05514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a0f7db0d11faeea987303d229b2d3a80959d403a05d5c1a3b4ccb7702a7ceb1fc8885fac35ed72e01fedf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "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" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd944e75ab3d238d0f227b4cb553459393c049fa367bf7da652c36467bf3b8f53",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bd2e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e8512",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeEmptycontract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xbd2e",
+                    "hash" : "0xc536dd17c18eb198c8645d022c6eeb44c1d773258425b20819d6af23d9105c23",
+                    "mixHash" : "0x8a7d338c998d17f0710ab20c3137c6fcafe068eff40f3b445353fc28d9a1655f",
+                    "nonce" : "0x6c08944f195e2212",
                     "number" : "0x01",
                     "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
                     "receiptTrie" : "0xd0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a0adaa6ba3037f336d2b177bb3c7eefcf224721b1ed033f32cd88da57a9428fe7988fec83f5bce725708f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a08a7d338c998d17f0710ab20c3137c6fcafe068eff40f3b445353fc28d9a1655f886c08944f195e2212f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x180881212a9a3123b511415af0368fee8bdcddd91d95a9b8f07b4bcfa67aa633",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc536dd17c18eb198c8645d022c6eeb44c1d773258425b20819d6af23d9105c23",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "callcodeEmptycontract_d0g0v0_Frontier" : {
+    "callcodeEmptycontract_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/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xba9a",
-                    "hash" : "0x620aac2a8f0d0873f1dffe656e996fe99e03732ab0934a3fb19e1675896dc9d7",
-                    "mixHash" : "0xe4a4fd2937bc6c4b54ba7be7fae147a16a8b73fc7e50a07f146b544c35587b08",
-                    "nonce" : "0x28711012a6ba8509",
+                    "gasUsed" : "0xbd2e",
+                    "hash" : "0xd422590ca24b5cb81f8d7a3237a1310c42f8398b6079f62912990a327bfe1a99",
+                    "mixHash" : "0x64ebf59f07b815045912426e0f82570230bfbc905bac08dbb638ce319f9b0fce",
+                    "nonce" : "0x0ac40f3791327a30",
                     "number" : "0x01",
                     "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "0x6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
-                    "stateRoot" : "0x7f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0",
+                    "receiptTrie" : "0xd0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25",
+                    "stateRoot" : "0x53e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a0e4a4fd2937bc6c4b54ba7be7fae147a16a8b73fc7e50a07f146b544c35587b088828711012a6ba8509f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa053e4bd0868f627961461bf3626fdcaa841589f2a8baab83cc8e54f00bbfc0942a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0d0ba0fbb176416fe62e237acdd9c989a544aac0e18629e370ab70c75a21aee25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a064ebf59f07b815045912426e0f82570230bfbc905bac08dbb638ce319f9b0fce880ac40f3791327a30f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x620aac2a8f0d0873f1dffe656e996fe99e03732ab0934a3fb19e1675896dc9d7",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd422590ca24b5cb81f8d7a3237a1310c42f8398b6079f62912990a327bfe1a99",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ba9a",
+                "balance" : "0x4563918244f4bd2e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e87a6",
+                "balance" : "0x0e8512",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "callcodeEmptycontract_d0g0v0_Homestead" : {
+    "callcodeEmptycontract_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/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xba9a",
-                    "hash" : "0xdc4f6d88e9ea5c14c31f578cac3c08bc610374d596071287944cf9675f0d85b6",
-                    "mixHash" : "0x7046b23c3e9516dc41184c6ee55835deac63da4d02aff0b71e32d5d7b4692bf8",
-                    "nonce" : "0xffdf32a1f1e12dde",
+                    "hash" : "0xf0ffb3dfa2ee1277b07252a410223b1c3c76bd6b871a1f0d8d7f38fd7b880dbe",
+                    "mixHash" : "0xbda66aed73766ceb697d82d1054c9d6424cb96b810904e6138fa16737a220f95",
+                    "nonce" : "0x11d7d95d0d2170eb",
                     "number" : "0x01",
                     "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
                     "receiptTrie" : "0x6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a07046b23c3e9516dc41184c6ee55835deac63da4d02aff0b71e32d5d7b4692bf888ffdf32a1f1e12ddef862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a0bda66aed73766ceb697d82d1054c9d6424cb96b810904e6138fa16737a220f958811d7d95d0d2170ebf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc4f6d88e9ea5c14c31f578cac3c08bc610374d596071287944cf9675f0d85b6",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf0ffb3dfa2ee1277b07252a410223b1c3c76bd6b871a1f0d8d7f38fd7b880dbe",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "callcodeEmptycontract_d0g0v0_Metropolis" : {
+    "callcodeEmptycontract_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/stCallCodes/callcodeEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xbd2e",
-                    "hash" : "0x392325b8d94fc75fa10731e819a74dc8a8c5df9d7142fea8ecf8a2f4532dd7e1",
-                    "mixHash" : "0x6ea5db3def75c96cd72fa09ddfd0a7e454a9f3cc0e36575c8f139738552fe6c3",
-                    "nonce" : "0x8da73581d97e53fe",
+                    "gasUsed" : "0xba9a",
+                    "hash" : "0xdb9dae45db2467a8ee66d849c806df635e93c2ebc67ccd53a1048982e64b650e",
+                    "mixHash" : "0x49a448ff02dea752d12c58bdde72f4cd7182f20b3fa09b3991fc97168942cbd4",
+                    "nonce" : "0x59d3116a0342c154",
                     "number" : "0x01",
                     "parentHash" : "0xf4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3",
-                    "receiptTrie" : "0x5514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97",
-                    "stateRoot" : "0x6a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1",
+                    "receiptTrie" : "0x6f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303",
+                    "stateRoot" : "0x7f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a29dfb5a6abfc4bb32fc91fd3aba3f8e3840a7f8881094dc2a4de82ce98a5d1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba05514828a83b891aaebed966927472b7ea110fc1f42c0b834b71fced9b76a9e97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bd2e8203e880a06ea5db3def75c96cd72fa09ddfd0a7e454a9f3cc0e36575c8f139738552fe6c3888da73581d97e53fef862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a0f4f7c7972a867b0794f5d4447b80e81516afd83ee0ef45b85028833b4c6a31f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f56584264200bdbb767599f69ff15aa247084977a26158506d5d0f7ff0fdaa0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba06f1d530bdcf0d33c293671c10fab49db556edfc39aaa30dbf40ba482501c3303b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ba9a8203e880a049a448ff02dea752d12c58bdde72f4cd7182f20b3fa09b3991fc97168942cbd48859d3116a0342c154f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93366e8c2941504a26d10518cea622642b9284c975a3a0ac19545d9ddf725e6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x392325b8d94fc75fa10731e819a74dc8a8c5df9d7142fea8ecf8a2f4532dd7e1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdb9dae45db2467a8ee66d849c806df635e93c2ebc67ccd53a1048982e64b650e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4bd2e",
+                "balance" : "0x4563918244f4ba9a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e8512",
+                "balance" : "0x0e87a6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0.json
index 6a832cea5..6e93e065c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeInInitcodeToEmptyContract_d0g0v0_EIP150" : {
+    "callcodeInInitcodeToEmptyContract_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/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012023",
-                    "hash" : "0x93b5cec38cca0fc38bac120a7f482fa58ab2e41f78b27b8922075e2279b345ed",
-                    "mixHash" : "0xe3a6501e86df4c6d93b767f759453954a99d75c92561835cb93d257d4c4b8986",
-                    "nonce" : "0x24239bbcf20f955e",
+                    "hash" : "0x4dbbb6634ba2b489d62abce69045eaf0a073313f226b7473f382e3fa32942fb6",
+                    "mixHash" : "0xa8c179ecbfa0a8f9a5f80412182f3ee81a6f3b1370698ef3387921f25c3438fd",
+                    "nonce" : "0x51aa40f4982370da",
                     "number" : "0x01",
                     "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "0x56de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369",
-                    "stateRoot" : "0xe4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5",
+                    "receiptTrie" : "0x48b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42",
+                    "stateRoot" : "0xd1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a0e3a6501e86df4c6d93b767f759453954a99d75c92561835cb93d257d4c4b89868824239bbcf20f955ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a048b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a0a8c179ecbfa0a8f9a5f80412182f3ee81a6f3b1370698ef3387921f25c3438fd8851aa40f4982370daf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93b5cec38cca0fc38bac120a7f482fa58ab2e41f78b27b8922075e2279b345ed",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4dbbb6634ba2b489d62abce69045eaf0a073313f226b7473f382e3fa32942fb6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01"
                 }
@@ -112,10 +119,10 @@
             }
         }
     },
-    "callcodeInInitcodeToEmptyContract_d0g0v0_EIP158" : {
+    "callcodeInInitcodeToEmptyContract_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/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012023",
-                    "hash" : "0xa19e5c18e893c53ebbcdcaf8a3f6261574edaab7d5ff077e2178c6bea799207b",
-                    "mixHash" : "0x9c1dc73a7a7e3a4654a77c905771bdebba85d4e06feb82bc51d4cb6a05d6e966",
-                    "nonce" : "0x8e0f9dccfebd7fbc",
+                    "hash" : "0x84a672567cc21dc7bfd66b32b8569e2d259816a2d4893df65b4bd23ca9f29d8b",
+                    "mixHash" : "0x8deb0be8158d870376712b2e2ce341bc898a72a82a894bed9be12498eb44486a",
+                    "nonce" : "0xdc54a961e79550bf",
                     "number" : "0x01",
                     "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "0x0745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9",
-                    "stateRoot" : "0x896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73",
+                    "receiptTrie" : "0x48b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42",
+                    "stateRoot" : "0xd1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a09c1dc73a7a7e3a4654a77c905771bdebba85d4e06feb82bc51d4cb6a05d6e966888e0f9dccfebd7fbcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a048b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a08deb0be8158d870376712b2e2ce341bc898a72a82a894bed9be12498eb44486a88dc54a961e79550bff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa19e5c18e893c53ebbcdcaf8a3f6261574edaab7d5ff077e2178c6bea799207b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x84a672567cc21dc7bfd66b32b8569e2d259816a2d4893df65b4bd23ca9f29d8b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -225,10 +239,10 @@
             }
         }
     },
-    "callcodeInInitcodeToEmptyContract_d0g0v0_Frontier" : {
+    "callcodeInInitcodeToEmptyContract_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/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +253,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x011d8f",
-                    "hash" : "0x1e54f49593b8b1b4b5c4ad362638a5e31622d457c585236238ec30937781e093",
-                    "mixHash" : "0xe2a44568c155d678db072b8392c32bd9958620ff97a8d18fd32b5de88584ecec",
-                    "nonce" : "0x50e3e529434401ef",
+                    "gasUsed" : "0x012023",
+                    "hash" : "0x3260b5a1c22ab7fc410342df68dde42845027a1b301f01d002f9e8cfd09c0c15",
+                    "mixHash" : "0x417ea990869b166b3ca61a0f2b7d7ccb8d98f7b06b8bde0d2e16145210ecc6b8",
+                    "nonce" : "0x0196d7c55c609c3d",
                     "number" : "0x01",
                     "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "0xd8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
-                    "stateRoot" : "0xd78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486",
+                    "receiptTrie" : "0x56de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369",
+                    "stateRoot" : "0xe4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a0e2a44568c155d678db072b8392c32bd9958620ff97a8d18fd32b5de88584ecec8850e3e529434401eff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4384da120539ce859e3517b824219a0e4ad3a54af01c7ca1042f9083ae469a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056de346fa5ae6fd12063335ed1333bf8ef3ae0a53700f0b4b332ac201cfb2369b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a0417ea990869b166b3ca61a0f2b7d7ccb8d98f7b06b8bde0d2e16145210ecc6b8880196d7c55c609c3df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e54f49593b8b1b4b5c4ad362638a5e31622d457c585236238ec30937781e093",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3260b5a1c22ab7fc410342df68dde42845027a1b301f01d002f9e8cfd09c0c15",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -307,14 +321,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51d8f",
+                "balance" : "0x4563918244f52023",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbfe271",
+                "balance" : "0x2386f26fbfdfdd",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +352,123 @@
             }
         }
     },
-    "callcodeInInitcodeToEmptyContract_d0g0v0_Homestead" : {
+    "callcodeInInitcodeToEmptyContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x012023",
+                    "hash" : "0x0465bb28c88f8eecbb8627c9ca3f0bdde7c626aa054692bac11c2108992cc1b8",
+                    "mixHash" : "0x77616506b0ea86027fa9d327f2f1f0baebca339e46134f38120351966d932f50",
+                    "nonce" : "0x798d2a21fea9b341",
+                    "number" : "0x01",
+                    "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+                    "receiptTrie" : "0x0745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9",
+                    "stateRoot" : "0x896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0896ffc485fc3042fc267f0c20f6f4f8f4ccc91fe847491025fac6d5add08ab73a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00745c1976e90d9cee0138a037b6fb3d90a286a453710f54941be29371c47e8d9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a077616506b0ea86027fa9d327f2f1f0baebca339e46134f38120351966d932f5088798d2a21fea9b341f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0465bb28c88f8eecbb8627c9ca3f0bdde7c626aa054692bac11c2108992cc1b8",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52023",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbfdfdd",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeInInitcodeToEmptyContract_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/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8f",
-                    "hash" : "0x3c890350ba3ecd47290111726d65f435568cfbf5dd4a40157f8acde473870153",
-                    "mixHash" : "0xdd65b5992df6dd35d6f2ca81e549471d0d5ac0afe5e5037b197de6ce5f0e7c60",
-                    "nonce" : "0xb8dec57096433cdf",
+                    "hash" : "0x27fece8225fc9b2615bd6fb68785a2f4c9746f95e411dd03b3855530c5276a27",
+                    "mixHash" : "0x4449a58f03b706ee9c6bed7c42bd49bdd98c7e97468ec5344ff13360e67b3e7b",
+                    "nonce" : "0x2cec3fdc4b75b635",
                     "number" : "0x01",
                     "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
                     "receiptTrie" : "0xd8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a0dd65b5992df6dd35d6f2ca81e549471d0d5ac0afe5e5037b197de6ce5f0e7c6088b8dec57096433cdff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a04449a58f03b706ee9c6bed7c42bd49bdd98c7e97468ec5344ff13360e67b3e7b882cec3fdc4b75b635f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c890350ba3ecd47290111726d65f435568cfbf5dd4a40157f8acde473870153",
-        "network" : "Homestead",
+        "lastblockhash" : "0x27fece8225fc9b2615bd6fb68785a2f4c9746f95e411dd03b3855530c5276a27",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "callcodeInInitcodeToEmptyContract_d0g0v0_Metropolis" : {
+    "callcodeInInitcodeToEmptyContract_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/stCallCodes/callcodeInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012023",
-                    "hash" : "0x8d28d4268e8ad1e664621fe5f9b5568f5bc8f07337d9e794ca47303f164befb7",
-                    "mixHash" : "0x92becdeab9e62d75f9e16b799f7b80cc2a1ce4eb705bf553d67db055618d5ab6",
-                    "nonce" : "0xca49a7c0a353af7e",
+                    "gasUsed" : "0x011d8f",
+                    "hash" : "0x0426100f46a1673e8786c0c03bc839870a0d769f0c80d89032704bcacac3bfc8",
+                    "mixHash" : "0x298a18e6408f4702250705e582556e0c4e809c341fe46b4e6756dbe08dc6b418",
+                    "nonce" : "0xbc87cadde0a9987e",
                     "number" : "0x01",
                     "parentHash" : "0xa8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7",
-                    "receiptTrie" : "0x48b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42",
-                    "stateRoot" : "0xd1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66",
+                    "receiptTrie" : "0xd8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335",
+                    "stateRoot" : "0xd78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1aeb274e80d20b571e991f60e3d80e63d007c5a70032fdf83dfdc3413192c66a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a048b288c78f5bed9a4a7b103c0b6cac3f9d351dc02afa28bb5eb4521b0cb6db42b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120238203e880a092becdeab9e62d75f9e16b799f7b80cc2a1ce4eb705bf553d67db055618d5ab688ca49a7c0a353af7ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0a8dcf305c4daff45dd27333493f067ea97f49ef841e1667768d626e89ff91db7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d78c731bb211e3e8751ca07f98948b29543fa7f814c11c161174c3a1279ce486a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0d8b47e710670d0ea297c042530863470be5ccc8a6770251e5c95239cd6c17335b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8f8203e880a0298a18e6408f4702250705e582556e0c4e809c341fe46b4e6756dbe08dc6b41888bc87cadde0a9987ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d9ee821f00949f6bca6748da79dd268332b5352305eff1721c91de338ef09ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d28d4268e8ad1e664621fe5f9b5568f5bc8f07337d9e794ca47303f164befb7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0426100f46a1673e8786c0c03bc839870a0d769f0c80d89032704bcacac3bfc8",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -534,20 +654,20 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52023",
+                "balance" : "0x4563918244f51d8f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbfdfdd",
+                "balance" : "0x2386f26fbfe271",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0.json
index 85b15e55e..c37c27ab2 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_EIP150" : {
+    "callcodeInInitcodeToExisContractWithVTransferNEMoney_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/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xffb7",
-                    "hash" : "0xf6657561c755cb527d51b3e279b3abdb81d6a5c86e597ea25513f869ace3d489",
-                    "mixHash" : "0xb99752cad4baaa5a48975a8b095ef98db173e93aff8f320502339841d1139337",
-                    "nonce" : "0x621311b3e79ad170",
+                    "hash" : "0x5da9647062fd8e77fb22da6289c58a96d6baba62570680296a2dc334c1c7b7bc",
+                    "mixHash" : "0xfb1b45380c06b8e313df18635de719e0feafc200f320152a51508e12e26c5b68",
+                    "nonce" : "0xcac238b37a44bbd7",
                     "number" : "0x01",
                     "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "0x6ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220",
-                    "stateRoot" : "0x3c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2f",
+                    "receiptTrie" : "0xbcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912d",
+                    "stateRoot" : "0xa3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a0b99752cad4baaa5a48975a8b095ef98db173e93aff8f320502339841d113933788621311b3e79ad170f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0bcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a0fb1b45380c06b8e313df18635de719e0feafc200f320152a51508e12e26c5b6888cac238b37a44bbd7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6657561c755cb527d51b3e279b3abdb81d6a5c86e597ea25513f869ace3d489",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5da9647062fd8e77fb22da6289c58a96d6baba62570680296a2dc334c1c7b7bc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -125,10 +132,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_EIP158" : {
+    "callcodeInInitcodeToExisContractWithVTransferNEMoney_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/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -140,18 +147,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xffb7",
-                    "hash" : "0x4c9604c46a03c8866c0e79bf7fc4afc0ba50c1ae19c415f0e722d4641562ab5e",
-                    "mixHash" : "0x01acb44e35cdde7ccab353f68afe5120085130c6c43f8408eeba3ffdbc320be4",
-                    "nonce" : "0x8beaea1a194fdcdd",
+                    "hash" : "0x671048ede4f1ea665d3055e28af908df5d3a1e6081ac174bbebc47365c19151e",
+                    "mixHash" : "0x7c260efa4aa55faa5a201ab6c537c2d595309a4366d23856226270f13d55dddb",
+                    "nonce" : "0x0108c0ba491c2291",
                     "number" : "0x01",
                     "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "0x5ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499b",
-                    "stateRoot" : "0xb81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1",
+                    "receiptTrie" : "0xbcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912d",
+                    "stateRoot" : "0xa3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a05ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a001acb44e35cdde7ccab353f68afe5120085130c6c43f8408eeba3ffdbc320be4888beaea1a194fdcddf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0bcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a07c260efa4aa55faa5a201ab6c537c2d595309a4366d23856226270f13d55dddb880108c0ba491c2291f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -188,9 +195,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c9604c46a03c8866c0e79bf7fc4afc0ba50c1ae19c415f0e722d4641562ab5e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x671048ede4f1ea665d3055e28af908df5d3a1e6081ac174bbebc47365c19151e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -251,10 +265,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_Frontier" : {
+    "callcodeInInitcodeToExisContractWithVTransferNEMoney_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/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -265,19 +279,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xfd23",
-                    "hash" : "0xd727f135f34e43e8f47401546bc4d7f39f09dbdc1fc23882e2261bce3347071b",
-                    "mixHash" : "0xb46dac4ea3a0a5c994d058be75fb7652947041fc1600d4d1f661bf5c9475fa2d",
-                    "nonce" : "0xa4003be091860b8e",
+                    "gasUsed" : "0xffb7",
+                    "hash" : "0x156fa8542588951829ba610f46ac52a75ab61b2200ca38543855b02cf6295c04",
+                    "mixHash" : "0x2ef5725eb5dead9159314b5c418c04142595d20b6df333a2d132b37f19f5533d",
+                    "nonce" : "0x3dbf93778dd89bac",
                     "number" : "0x01",
                     "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "0x780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
-                    "stateRoot" : "0x3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
+                    "receiptTrie" : "0x6ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220",
+                    "stateRoot" : "0x3c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a0b46dac4ea3a0a5c994d058be75fb7652947041fc1600d4d1f661bf5c9475fa2d88a4003be091860b8ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7a62bd45dc30d80b1553d1a558bfdb96c68bd9b0141a65badd266fb77ddb2fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06ca84d40495dfb42ccaed73f28c678d656273f355baacceaafd6c40ea55fe220b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a02ef5725eb5dead9159314b5c418c04142595d20b6df333a2d132b37f19f5533d883dbf93778dd89bacf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -314,8 +328,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd727f135f34e43e8f47401546bc4d7f39f09dbdc1fc23882e2261bce3347071b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x156fa8542588951829ba610f46ac52a75ab61b2200ca38543855b02cf6295c04",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -332,7 +346,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fd23",
+                "balance" : "0x4563918244f4ffb7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -346,7 +360,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc002dd",
+                "balance" : "0x2386f26fc00049",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +391,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_Homestead" : {
+    "callcodeInInitcodeToExisContractWithVTransferNEMoney_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/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +405,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xfd23",
-                    "hash" : "0x93086b63bcd0026726e321fa391e135ce8a34ffb9ba849a420f01f8b9349481f",
-                    "mixHash" : "0x03d11ba254d5510eab11fa0a5f0d8edef4e6223bc9030b7b8826fe2ecdcc10fd",
-                    "nonce" : "0xefd798826b1741c5",
+                    "gasUsed" : "0xffb7",
+                    "hash" : "0xf694b86fa2684fb020ba230b7d61785edfd506d34711f367a1b1e6b4feaab650",
+                    "mixHash" : "0xefebb91d8e1ff40aa26bad746ec2808e02715c47df88627c65173ea3bcfac5a3",
+                    "nonce" : "0x5d8d28ecd8778d78",
                     "number" : "0x01",
                     "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "0x780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
-                    "stateRoot" : "0x3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
+                    "receiptTrie" : "0x5ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499b",
+                    "stateRoot" : "0xb81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a003d11ba254d5510eab11fa0a5f0d8edef4e6223bc9030b7b8826fe2ecdcc10fd88efd798826b1741c5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b81ad6358e612451ce81044e1d3f54d0ef1ced101052fc38dd5b763d6704a3a1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a05ec054dceda0108e7188e1966bb2adbac4ba41c7ffa27471229689caa563499bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a0efebb91d8e1ff40aa26bad746ec2808e02715c47df88627c65173ea3bcfac5a3885d8d28ecd8778d78f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93086b63bcd0026726e321fa391e135ce8a34ffb9ba849a420f01f8b9349481f",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf694b86fa2684fb020ba230b7d61785edfd506d34711f367a1b1e6b4feaab650",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -453,12 +467,12 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4fd23",
+                "balance" : "0x4563918244f4ffb7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -472,7 +486,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc002dd",
+                "balance" : "0x2386f26fc00049",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -503,10 +517,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_Metropolis" : {
+    "callcodeInInitcodeToExisContractWithVTransferNEMoney_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/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -517,19 +531,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xffb7",
-                    "hash" : "0x11d9e98eef8698a5a677353248eb333756799aa3effa15a74b1674f63514efbc",
-                    "mixHash" : "0x19b2f6ce725de4ea917343d33a368967c5bf2c9c333265b3b8c3e0973252758c",
-                    "nonce" : "0x6626aaaa816cad4e",
+                    "gasUsed" : "0xfd23",
+                    "hash" : "0x78e06894c38584fb0c312fb6a16cda0ee351e3669a17d4a4dfc6920c1991a555",
+                    "mixHash" : "0x2363be8821c8c865641a359ea78bea1627cc8166ae0cdacdcc6cb500b7288892",
+                    "nonce" : "0x908429b0cb8befe8",
                     "number" : "0x01",
                     "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
-                    "receiptTrie" : "0xbcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912d",
-                    "stateRoot" : "0xa3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5",
+                    "receiptTrie" : "0x780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
+                    "stateRoot" : "0x3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3f584de09ca848138a7a7cd28bd91e89696c7bf5b706f45bd3a03569d0490a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0bcc60625b4191bafc73d74ed615797f4f8f2d27f95f9a1e6d39719e245b5912db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ffb78203e880a019b2f6ce725de4ea917343d33a368967c5bf2c9c333265b3b8c3e0973252758c886626aaaa816cad4ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a02363be8821c8c865641a359ea78bea1627cc8166ae0cdacdcc6cb500b728889288908429b0cb8befe8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -566,16 +580,135 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11d9e98eef8698a5a677353248eb333756799aa3effa15a74b1674f63514efbc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x78e06894c38584fb0c312fb6a16cda0ee351e3669a17d4a4dfc6920c1991a555",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4fd23",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc002dd",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xfd23",
+                    "hash" : "0x6a7d3cbf023c9f01e71d3d435dca6ed3550caafdecad83c0e4b5e5cffa1f2b7f",
+                    "mixHash" : "0xbe776d26db6af9cde30f838e4a67e66a9c1af3b0198505f19fe0365fbd7fb349",
+                    "nonce" : "0x396bff3fda563142",
+                    "number" : "0x01",
+                    "parentHash" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+                    "receiptTrie" : "0x780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4",
+                    "stateRoot" : "0x3621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a072a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03621f0fee436564f2861a45c5f242f0c3d90aafd8cac445e9af4b4a30ed98ba3a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0780da83fe09e228d95a03bd299fc6f7c10f71b8b15c508b444a345a69a4efca4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fd238203e880a0be776d26db6af9cde30f838e4a67e66a9c1af3b0198505f19fe0365fbd7fb34988396bff3fda563142f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x72a3052fbd2c5dc406dd747e1ed2e7ded4a0ba56e90549789363f84176328d2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0040c4fb84b0dea181a27ac441122a4bf819bc6d8e758797c3a5b1361d3dad220a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a7d3cbf023c9f01e71d3d435dca6ed3550caafdecad83c0e4b5e5cffa1f2b7f",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -586,12 +719,12 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ffb7",
+                "balance" : "0x4563918244f4fd23",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -605,7 +738,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc00049",
+                "balance" : "0x2386f26fc002dd",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0.json
index 725174a7e..ede09f510 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_EIP150" : {
+    "callcodeInInitcodeToExistingContractWithValueTransfer_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/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x018875",
-                    "hash" : "0xf9e2347c591f2c35a756127b241e139c6189d0c5c2cac06ba2c8e70fc555af03",
-                    "mixHash" : "0xf185506092c10c5aef8537ce11cd0e4b83580c88de5cb3e22d4d4f372995a068",
-                    "nonce" : "0xa942c2f1c150e804",
+                    "hash" : "0xfe82bdbf6659437ee713b275f4ff54db436a2de876517577920a535efe8dd2d7",
+                    "mixHash" : "0x0ac46af15258860bc3a57399ad7fc58de32e1286304e17a45a0c4c264ed5f693",
+                    "nonce" : "0x69ee350ce91a8ee3",
                     "number" : "0x01",
                     "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "0x7d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4",
-                    "stateRoot" : "0xb6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fff",
+                    "receiptTrie" : "0xdb10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0",
+                    "stateRoot" : "0xb1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fffa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0f185506092c10c5aef8537ce11cd0e4b83580c88de5cb3e22d4d4f372995a06888a942c2f1c150e804f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a00ac46af15258860bc3a57399ad7fc58de32e1286304e17a45a0c4c264ed5f6938869ee350ce91a8ee3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9e2347c591f2c35a756127b241e139c6189d0c5c2cac06ba2c8e70fc555af03",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfe82bdbf6659437ee713b275f4ff54db436a2de876517577920a535efe8dd2d7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
@@ -127,10 +134,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_EIP158" : {
+    "callcodeInInitcodeToExistingContractWithValueTransfer_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/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +149,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x018875",
-                    "hash" : "0xaa1d97c1517a668d4875a738c28ae4a4f35d0b30c16f64f1acda9f85d7066a75",
-                    "mixHash" : "0x5fbca8fb9ba13c2a9592d1f7aaf121dcc789f6bb899f5f66373f37260d55bd33",
-                    "nonce" : "0x5edb57f4047e05cb",
+                    "hash" : "0xab3bfb8f33c59670bd4aee7fae0f3605c5b3452c3bf0fead3f9d491167aaf341",
+                    "mixHash" : "0x471814f69818fe37c6114ae0ed85c7d360ee41cbf6eeaa932b5386e1703fcd4c",
+                    "nonce" : "0xd32a8a28a24c8bb5",
                     "number" : "0x01",
                     "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "0xefb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078",
-                    "stateRoot" : "0x0b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6",
+                    "receiptTrie" : "0xdb10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0",
+                    "stateRoot" : "0xb1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0efb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a05fbca8fb9ba13c2a9592d1f7aaf121dcc789f6bb899f5f66373f37260d55bd33885edb57f4047e05cbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0471814f69818fe37c6114ae0ed85c7d360ee41cbf6eeaa932b5386e1703fcd4c88d32a8a28a24c8bb5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,9 +197,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa1d97c1517a668d4875a738c28ae4a4f35d0b30c16f64f1acda9f85d7066a75",
-        "network" : "EIP158",
+        "lastblockhash" : "0xab3bfb8f33c59670bd4aee7fae0f3605c5b3452c3bf0fead3f9d491167aaf341",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
@@ -255,10 +269,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_Frontier" : {
+    "callcodeInInitcodeToExistingContractWithValueTransfer_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/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -269,19 +283,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0185e1",
-                    "hash" : "0xf51d2a433885dfd86eb0eebcb5ee1aa7f6136201710861bc0e935038de85330f",
-                    "mixHash" : "0xdc3bdfefb19d2d39ece764b47fdd1de71fd1bff33735a079084bc916ea139096",
-                    "nonce" : "0xc9e68a2eb3e83c31",
+                    "gasUsed" : "0x018875",
+                    "hash" : "0x3ca32d700365fa14b8ad84edcaaac813d2dbad0252feb134e152a1e2f1672baf",
+                    "mixHash" : "0xf5236ae3838dd5f2d61dadd57fdf6aa8af34434553586f1282fbc846cb7f2223",
+                    "nonce" : "0x9a97c04eb8d2770e",
                     "number" : "0x01",
                     "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "0xa23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
-                    "stateRoot" : "0xc0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
+                    "receiptTrie" : "0x7d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4",
+                    "stateRoot" : "0xb6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a0dc3bdfefb19d2d39ece764b47fdd1de71fd1bff33735a079084bc916ea13909688c9e68a2eb3e83c31f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6b093e75db3397817e1e56fc76e9aaa805f9b94307ce1e79c608a1127a61fffa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07d151e4dda50e27dac73052801058c8f2f4e863677bbfc155f8cd243a0fa24c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0f5236ae3838dd5f2d61dadd57fdf6aa8af34434553586f1282fbc846cb7f2223889a97c04eb8d2770ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,8 +332,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf51d2a433885dfd86eb0eebcb5ee1aa7f6136201710861bc0e935038de85330f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3ca32d700365fa14b8ad84edcaaac813d2dbad0252feb134e152a1e2f1672baf",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
@@ -338,7 +352,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f585e1",
+                "balance" : "0x4563918244f58875",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -352,7 +366,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf7a1f",
+                "balance" : "0x2386f26fbf778b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -383,10 +397,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_Homestead" : {
+    "callcodeInInitcodeToExistingContractWithValueTransfer_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/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,19 +411,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0185e1",
-                    "hash" : "0x68f3644bc853bf48b64f2fcb2ce1d85985752805d01f1d5a18f769b1a61fb507",
-                    "mixHash" : "0x767cf52173d391ad28fb882b0037c5285611b1ee141ee7641f58c4b94ff34f04",
-                    "nonce" : "0x80749f8e8b11d021",
+                    "gasUsed" : "0x018875",
+                    "hash" : "0x390f15277c1b3f2d4196cf1f5f15b769af213fd4094969c1379664edc303bfaa",
+                    "mixHash" : "0x6e3d145d36fe0ed10b8f54bb196b50e2aca0e2fa3077472005861503f33de466",
+                    "nonce" : "0x65ade6224aac68aa",
                     "number" : "0x01",
                     "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "0xa23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
-                    "stateRoot" : "0xc0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
+                    "receiptTrie" : "0xefb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078",
+                    "stateRoot" : "0x0b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a0767cf52173d391ad28fb882b0037c5285611b1ee141ee7641f58c4b94ff34f048880749f8e8b11d021f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b6b4816c2cde4dca95457e6991fc111374092dfb73767a91a6d438487245ea6a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0efb760972844a6f828af17d3b5da46e8b1543fbb8f8c1414eff1cdfcf4359078b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a06e3d145d36fe0ed10b8f54bb196b50e2aca0e2fa3077472005861503f33de4668865ade6224aac68aaf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -446,8 +460,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68f3644bc853bf48b64f2fcb2ce1d85985752805d01f1d5a18f769b1a61fb507",
-        "network" : "Homestead",
+        "lastblockhash" : "0x390f15277c1b3f2d4196cf1f5f15b769af213fd4094969c1379664edc303bfaa",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
@@ -459,14 +473,14 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f585e1",
+                "balance" : "0x4563918244f58875",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -480,7 +494,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf7a1f",
+                "balance" : "0x2386f26fbf778b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -511,10 +525,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_Metropolis" : {
+    "callcodeInInitcodeToExistingContractWithValueTransfer_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/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -525,19 +539,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x018875",
-                    "hash" : "0xa840e63878d5c9b9e935dbee6ac75b9a974c3a66379999bad3ad9603c795955d",
-                    "mixHash" : "0xca0813cf923fe3f00f1bc34158f0e3115d0dd9b16fe14b8767a1df6914667ce1",
-                    "nonce" : "0xbf018fde66f7c5c0",
+                    "gasUsed" : "0x0185e1",
+                    "hash" : "0xbe462a6fbfc3b1b441a9d8d8ebdcbc287352c0eea5d25100b679ca9788a2a4ca",
+                    "mixHash" : "0x085451ac0999f70ab19ddadf6868c2c92e18d91299d1917be6e77fe57708dcb2",
+                    "nonce" : "0x35a9b9ef64f10a38",
                     "number" : "0x01",
                     "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
-                    "receiptTrie" : "0xdb10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0",
-                    "stateRoot" : "0xb1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038",
+                    "receiptTrie" : "0xa23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
+                    "stateRoot" : "0xc0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b1a454dafaba3bfe0da0dc3a60962290b74bf3875090f3a5c6d1802cd0cee038a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db10d8429fd392ff097acdd5a413d3f5a004319b55a96d75f0b0f5b817b999a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830188758203e880a0ca0813cf923fe3f00f1bc34158f0e3115d0dd9b16fe14b8767a1df6914667ce188bf018fde66f7c5c0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a0085451ac0999f70ab19ddadf6868c2c92e18d91299d1917be6e77fe57708dcb28835a9b9ef64f10a38f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -574,16 +588,137 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa840e63878d5c9b9e935dbee6ac75b9a974c3a66379999bad3ad9603c795955d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbe462a6fbfc3b1b441a9d8d8ebdcbc287352c0eea5d25100b679ca9788a2a4ca",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270b",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x05",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f585e1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf7a1f",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0185e1",
+                    "hash" : "0xe2fd09be22bdd83318a0d1c3440891eb37443e88fc1feedbdd41e577a5ffb7d1",
+                    "mixHash" : "0x1966a3f89ca50274635eb37a55ceceb8e291baf40591b402ff7c90464d0d569d",
+                    "nonce" : "0x35364f3288685443",
+                    "number" : "0x01",
+                    "parentHash" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+                    "receiptTrie" : "0xa23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63",
+                    "stateRoot" : "0xc0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0f1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0a7bba762c7162166ed41e77dafe2b10ea86df52b0e08cec35c4d8cc379fb7fa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0a23fb8a02d6a10e6df422b5f267c17c2ec953b3f66fe5e65bfc0fc4b40f22c63b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830185e18203e880a01966a3f89ca50274635eb37a55ceceb8e291baf40591b402ff7c90464d0d569d8835364f3288685443f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0xf1b056664010285698916f4077a0e61ae0582a5ec27e0ec242f5ce2b84fc3040",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a0ffd5a31c20db0f7246a396d901f9e10fcb03b39277746c95c4c18eea4ff8da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe2fd09be22bdd83318a0d1c3440891eb37443e88fc1feedbdd41e577a5ffb7d1",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
@@ -594,14 +729,14 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f58875",
+                "balance" : "0x4563918244f585e1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -615,7 +750,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf778b",
+                "balance" : "0x2386f26fbf7a1f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
index 6f6df4f76..af452ae25 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeInInitcodeToExistingContract_d0g0v0_EIP150" : {
+    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e49",
-                    "hash" : "0xf7b36b5b6e24f726ee97e981876381aca6ba8923215f2199d0d36c91af6abb85",
-                    "mixHash" : "0x9162369200dc20a7859d76d66947492d675d14c61ce2bb1df2bb8e4131085ea8",
-                    "nonce" : "0x858937f62efd7cf4",
+                    "hash" : "0x58defc512277834c53d7de512c37afefa6e8b049fbdeeaa22b83d9190a0f59ff",
+                    "mixHash" : "0x7be43233c94f390956b176b98994f5b3ff682a26b7a3eab96598154ffae2bec0",
+                    "nonce" : "0x374e0fcd93b1fd75",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x16c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5",
-                    "stateRoot" : "0x10035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2",
+                    "receiptTrie" : "0x382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9",
+                    "stateRoot" : "0xa2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a016c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a09162369200dc20a7859d76d66947492d675d14c61ce2bb1df2bb8e4131085ea888858937f62efd7cf4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0ca074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a07be43233c94f390956b176b98994f5b3ff682a26b7a3eab96598154ffae2bec088374e0fcd93b1fd75f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7b36b5b6e24f726ee97e981876381aca6ba8923215f2199d0d36c91af6abb85",
-        "network" : "EIP150",
+        "lastblockhash" : "0x58defc512277834c53d7de512c37afefa6e8b049fbdeeaa22b83d9190a0f59ff",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -82,7 +89,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContract_d0g0v0_EIP158" : {
+    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,18 +163,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e49",
-                    "hash" : "0x555044f14385dac69ada6ef3e466cee40cf8751a7ab7cacc6a1ec7c68ad9f849",
-                    "mixHash" : "0xca771ea95bcb8f4546f6b2cd7d60b5d1a0f5f7091a0f2565cb5fa5194f29dc9c",
-                    "nonce" : "0xacc4acbda7879536",
+                    "hash" : "0xe5a9dc6a306b5f0b2c3bcaabf52d655c220972d12a5ba14d3e6c59286657ea84",
+                    "mixHash" : "0x9f2b9af443813b3bc5f616cfbf03fb1499957d7273e6ad8cbbe08b980362726c",
+                    "nonce" : "0x30a5254fddc99179",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x6cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915af",
-                    "stateRoot" : "0x15a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830a",
+                    "receiptTrie" : "0x382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9",
+                    "stateRoot" : "0xa2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0ca771ea95bcb8f4546f6b2cd7d60b5d1a0f5f7091a0f2565cb5fa5194f29dc9c88acc4acbda7879536f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0ca074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a09f2b9af443813b3bc5f616cfbf03fb1499957d7273e6ad8cbbe08b980362726c8830a5254fddc99179f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,9 +211,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x555044f14385dac69ada6ef3e466cee40cf8751a7ab7cacc6a1ec7c68ad9f849",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe5a9dc6a306b5f0b2c3bcaabf52d655c220972d12a5ba14d3e6c59286657ea84",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -283,10 +297,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContract_d0g0v0_Frontier" : {
+    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +311,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016bb5",
-                    "hash" : "0xf5d91bffb1a227bfb9312c0b5c6a762fb4c69c7db34b7214056df514b35b47c0",
-                    "mixHash" : "0xfa6fa9c9a518c8361feb3a333f661a1dc42c86aacb7fefe4dcead64ae38b76ea",
-                    "nonce" : "0x56e0497b25ae50d1",
+                    "gasUsed" : "0x016e49",
+                    "hash" : "0x10cd3b8644286b3e9ebc4a676632be46f397deb3890a147287afeadac8e03344",
+                    "mixHash" : "0x8d9b1fea55eb475d5bff0b2b005b34cf6ccb40843da9451ac2f087554a491fbf",
+                    "nonce" : "0x3006e99dd1deaa34",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
-                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
+                    "receiptTrie" : "0x16c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5",
+                    "stateRoot" : "0x10035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a0fa6fa9c9a518c8361feb3a333f661a1dc42c86aacb7fefe4dcead64ae38b76ea8856e0497b25ae50d1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a016c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a08d9b1fea55eb475d5bff0b2b005b34cf6ccb40843da9451ac2f087554a491fbf883006e99dd1deaa34f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5d91bffb1a227bfb9312c0b5c6a762fb4c69c7db34b7214056df514b35b47c0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x10cd3b8644286b3e9ebc4a676632be46f397deb3890a147287afeadac8e03344",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -373,7 +387,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56bb5",
+                "balance" : "0x4563918244f56e49",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -387,7 +401,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf944b",
+                "balance" : "0x2386f26fbf91b7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +439,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContract_d0g0v0_Homestead" : {
+    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -439,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016bb5",
-                    "hash" : "0x43fc836cda72a9f71e3418dcf51aa44e2a784d9fd15ecf39bff8cd8b10124b1d",
-                    "mixHash" : "0xfd4a065efd76e6140e569f3ea309d35c9253ab0189dc6d70f07ee1cd55a51901",
-                    "nonce" : "0xf514a6a9189dcefb",
+                    "gasUsed" : "0x016e49",
+                    "hash" : "0x45648d08ce1e28eaec6bb31abae85ee769cad93b0e2320a12aa4d6b94c3b075e",
+                    "mixHash" : "0xdfefb4837ae99779dde4b4a127e014c032b72cacf8fc5f9035a02aab5910ed6c",
+                    "nonce" : "0xe4886cde720ef7c9",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
-                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
+                    "receiptTrie" : "0x6cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915af",
+                    "stateRoot" : "0x15a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a0fd4a065efd76e6140e569f3ea309d35c9253ab0189dc6d70f07ee1cd55a5190188f514a6a9189dcefbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0dfefb4837ae99779dde4b4a127e014c032b72cacf8fc5f9035a02aab5910ed6c88e4886cde720ef7c9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43fc836cda72a9f71e3418dcf51aa44e2a784d9fd15ecf39bff8cd8b10124b1d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x45648d08ce1e28eaec6bb31abae85ee769cad93b0e2320a12aa4d6b94c3b075e",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -508,14 +522,14 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56bb5",
+                "balance" : "0x4563918244f56e49",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -529,7 +543,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf944b",
+                "balance" : "0x2386f26fbf91b7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -567,10 +581,10 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContract_d0g0v0_Metropolis" : {
+    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +595,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e49",
-                    "hash" : "0x0acb6e8718c61386d8d0994d9f3b0e832c1f2d657f161122eae4b1d072d6454d",
-                    "mixHash" : "0x019c1b03b20ab8a70870ed007f2a55a350db7c9a61d40121ec4054b7a0d4a424",
-                    "nonce" : "0xd20c2c1728d9bab7",
+                    "gasUsed" : "0x016bb5",
+                    "hash" : "0x991f6137b532c98df43eb3bb1cfb7f6468e9bd7615517ad00ac463374ef66795",
+                    "mixHash" : "0x7569cc75bc260ff3d8ba213defc94ec456df6af0a66396c6a83ddb649511ec05",
+                    "nonce" : "0xa605e7cf76786826",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9",
-                    "stateRoot" : "0xa2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0c",
+                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
+                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a2f8eaad77429c766485ac8cbdf1f85400b87953b44d7524204fd0546c4c5d0ca074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0019c1b03b20ab8a70870ed007f2a55a350db7c9a61d40121ec4054b7a0d4a42488d20c2c1728d9bab7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a07569cc75bc260ff3d8ba213defc94ec456df6af0a66396c6a83ddb649511ec0588a605e7cf76786826f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +644,151 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0acb6e8718c61386d8d0994d9f3b0e832c1f2d657f161122eae4b1d072d6454d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x991f6137b532c98df43eb3bb1cfb7f6468e9bd7615517ad00ac463374ef66795",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56bb5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf944b",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeInInitcodeToExistingContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x016bb5",
+                    "hash" : "0x52e1b882500d4d51e54c489a1c9cfcd9e6b47698f4d552fc148888b160bf5a0d",
+                    "mixHash" : "0x41f428837983af6fd1c3e2c738b5c623f6d9700d37ffac29358be18b1bb42cd5",
+                    "nonce" : "0xd7b9dc44ca002870",
+                    "number" : "0x01",
+                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
+                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a041f428837983af6fd1c3e2c738b5c623f6d9700d37ffac29358be18b1bb42cd588d7b9dc44ca002870f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "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" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x52e1b882500d4d51e54c489a1c9cfcd9e6b47698f4d552fc148888b160bf5a0d",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -657,14 +806,14 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e49",
+                "balance" : "0x4563918244f56bb5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -678,7 +827,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91b7",
+                "balance" : "0x2386f26fbf944b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC_d0g0v0.json
index c97000135..78ece21f0 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcode_checkPC_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcode_checkPC_d0g0v0_EIP150" : {
+    "callcode_checkPC_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/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa306",
-                    "hash" : "0x0011816d96bdd1663715a91e927a238aef8f6a8046f145536596111bf3c11e59",
-                    "mixHash" : "0x44606597d8749e8a27582a99cd34a98d35be5435e7f279fa8ecc758eb007b991",
-                    "nonce" : "0x1ce2ed2aed3ae3f2",
+                    "hash" : "0x5652d82d1504fd270dac56f913e1d05d849ac5a8ddd7dc5341156dd2eceb8035",
+                    "mixHash" : "0xbc8894e93597725d57aaff0eeab6aafec06af4ec72df8e0f022aa963499560f1",
+                    "nonce" : "0x4407580bba5b5f07",
                     "number" : "0x01",
                     "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "0xe19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
-                    "stateRoot" : "0x5b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3",
+                    "receiptTrie" : "0x16462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dc",
+                    "stateRoot" : "0xae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a044606597d8749e8a27582a99cd34a98d35be5435e7f279fa8ecc758eb007b991881ce2ed2aed3ae3f2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a016462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a0bc8894e93597725d57aaff0eeab6aafec06af4ec72df8e0f022aa963499560f1884407580bba5b5f07f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0011816d96bdd1663715a91e927a238aef8f6a8046f145536596111bf3c11e59",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5652d82d1504fd270dac56f913e1d05d849ac5a8ddd7dc5341156dd2eceb8035",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callcode_checkPC_d0g0v0_EIP158" : {
+    "callcode_checkPC_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/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,9 +141,136 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa306",
-                    "hash" : "0xe94d2b7b29e4393f807cf9f8a953fdd912092d9d3b715ca0a366de8d837d3105",
-                    "mixHash" : "0x05b89cf32224a07288a446959ccf5e1bae1e63fa7fed3cd1f62b6df26ffa045f",
-                    "nonce" : "0x92d5e28ca5d8ed76",
+                    "hash" : "0x78d6a96b16dbf446207b6c193921bcd0328487d0f9e5b719ac88721a556b6b6b",
+                    "mixHash" : "0x4c80a63d824badae2ad20bc4379d1d98a93110abebb709c71f618e76fbdf8699",
+                    "nonce" : "0x76aa5722b40505ab",
+                    "number" : "0x01",
+                    "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+                    "receiptTrie" : "0x16462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dc",
+                    "stateRoot" : "0xae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a016462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a04c80a63d824badae2ad20bc4379d1d98a93110abebb709c71f618e76fbdf86998876aa5722b40505abf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x78d6a96b16dbf446207b6c193921bcd0328487d0f9e5b719ac88721a556b6b6b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0x25"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a306",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635cfa",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcode_checkPC_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0xa306",
+                    "hash" : "0xef25819aa753133a87c4343a5bf77c9ca4f487d44c2f5cee09b3b886164089ce",
+                    "mixHash" : "0xf30cb2c34dec39de73a3ad85063ac447c456c89090a56f8ff4270fc4df300067",
+                    "nonce" : "0x2d14349bfc1ab2e2",
                     "number" : "0x01",
                     "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
                     "receiptTrie" : "0xe19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
@@ -145,7 +279,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a005b89cf32224a07288a446959ccf5e1bae1e63fa7fed3cd1f62b6df26ffa045f8892d5e28ca5d8ed76f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a0f30cb2c34dec39de73a3ad85063ac447c456c89090a56f8ff4270fc4df300067882d14349bfc1ab2e2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe94d2b7b29e4393f807cf9f8a953fdd912092d9d3b715ca0a366de8d837d3105",
-        "network" : "EIP158",
+        "lastblockhash" : "0xef25819aa753133a87c4343a5bf77c9ca4f487d44c2f5cee09b3b886164089ce",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -239,10 +373,10 @@
             }
         }
     },
-    "callcode_checkPC_d0g0v0_Frontier" : {
+    "callcode_checkPC_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/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0xa072",
-                    "hash" : "0x5f9637fecbc20631fa81ccf7b3ea20103e151ea2bbe45613062994d298ed616f",
-                    "mixHash" : "0xcf9229a3cf4471c7018d2d00f7633bc6b5bddc3cf6e55c1ad6e503eebd5970c9",
-                    "nonce" : "0xde9fb8d14c7f9e0f",
+                    "gasUsed" : "0xa306",
+                    "hash" : "0x194940a3c6d04a0d4f84bbeb1fd03543a590e6f627e83014d2b379b0b5a0d08c",
+                    "mixHash" : "0xe367f7e4f59a35c814a1e0d86b150883ac69a3a605a1f5f6a0619c249ad929a6",
+                    "nonce" : "0xe00022ac231f683c",
                     "number" : "0x01",
                     "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "0x7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
-                    "stateRoot" : "0x1884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1a",
+                    "receiptTrie" : "0xe19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8",
+                    "stateRoot" : "0x5b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a0cf9229a3cf4471c7018d2d00f7633bc6b5bddc3cf6e55c1ad6e503eebd5970c988de9fb8d14c7f9e0ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b690bbfad4814122e2c0fdd803397cada968c13482305bd41468142d97bb5b3a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e19ad99d7a4a33a6d92f0d683697b7849cbfabae5763162978f475fef88583c8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a0e367f7e4f59a35c814a1e0d86b150883ac69a3a605a1f5f6a0619c249ad929a688e00022ac231f683cf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f9637fecbc20631fa81ccf7b3ea20103e151ea2bbe45613062994d298ed616f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x194940a3c6d04a0d4f84bbeb1fd03543a590e6f627e83014d2b379b0b5a0d08c",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -321,14 +455,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a072",
+                "balance" : "0x4563918244f4a306",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635f8e",
+                "balance" : "0x0de0b6b3a7635cfa",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -359,10 +493,10 @@
             }
         }
     },
-    "callcode_checkPC_d0g0v0_Homestead" : {
+    "callcode_checkPC_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/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,9 +508,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0xa072",
-                    "hash" : "0x4d760ee3600d7b6680b5b15aa2378022a1910b7bef90f35e7d659ce5f68f58bc",
-                    "mixHash" : "0x4e8f61432a22f6541e9d06a94e172b99260121d5dc5e401dc96a3e7356111e9c",
-                    "nonce" : "0xeeaca494708ca506",
+                    "hash" : "0xa487dc4b95d91cf60bea01ed62fddcb6ab0d1ce94e46e97840d0897ed9086e37",
+                    "mixHash" : "0xbb29248b8ab54b997f6dc29db07ffc979149d41414b7ecd02b10808c8f3f0896",
+                    "nonce" : "0xe9a61b71a84ab34b",
                     "number" : "0x01",
                     "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
                     "receiptTrie" : "0x7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
@@ -385,7 +519,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a04e8f61432a22f6541e9d06a94e172b99260121d5dc5e401dc96a3e7356111e9c88eeaca494708ca506f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a0bb29248b8ab54b997f6dc29db07ffc979149d41414b7ecd02b10808c8f3f089688e9a61b71a84ab34bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -422,8 +556,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d760ee3600d7b6680b5b15aa2378022a1910b7bef90f35e7d659ce5f68f58bc",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa487dc4b95d91cf60bea01ed62fddcb6ab0d1ce94e46e97840d0897ed9086e37",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -479,10 +613,10 @@
             }
         }
     },
-    "callcode_checkPC_d0g0v0_Metropolis" : {
+    "callcode_checkPC_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/stCallCodes/callcode_checkPC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +627,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0xa306",
-                    "hash" : "0xdcf6044355cdaaedb689f2d7e6ea304263dd7a4ff1c8f083cc36acce8ac62d79",
-                    "mixHash" : "0xdf52935aabd7918098841e22162fe88c28e37446233274ccd047bec7e59988f0",
-                    "nonce" : "0x9158ab72ce8b754e",
+                    "gasUsed" : "0xa072",
+                    "hash" : "0xa40a631b24e00fa383406602e1bcdddffeb390f153833c51107f5faf6863c0a9",
+                    "mixHash" : "0xe627fb7cc79f4022844f9be2b8890729bd9fc66ddb434e6d57f15aef14a86ef2",
+                    "nonce" : "0x551a0694761c8c7f",
                     "number" : "0x01",
                     "parentHash" : "0x5fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cf",
-                    "receiptTrie" : "0x16462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dc",
-                    "stateRoot" : "0xae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1d",
+                    "receiptTrie" : "0x7e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021",
+                    "stateRoot" : "0x1884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae9b4e8f695435c0bcc2fdc8802febb91a1c5acb71097f9e121415ec97979b1da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a016462552e8851b6efdc7a81cb2a4bf1504cf1162e140471e001c3825244862dcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a3068203e880a0df52935aabd7918098841e22162fe88c28e37446233274ccd047bec7e59988f0889158ab72ce8b754ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90261f901f8a05fbd7b41ab5961891a08f25e96b6151836ff910c1b4be6d4ff998d0db72094cfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01884e562f6d953b4401282638596de825366d90349038c8dfab9824396a35d1aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07e779ac6cdfd4d43cf3d2079ac020e0012c8319e934daa43bc311e9ce7162021b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0082a0728203e880a0e627fb7cc79f4022844f9be2b8890729bd9fc66ddb434e6d57f15aef14a86ef288551a0694761c8c7ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,16 +676,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2ce4837ca3e3d2c81f601580d9ecd4728049d2c9bf3a4fe534bf1a1ea001bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcf6044355cdaaedb689f2d7e6ea304263dd7a4ff1c8f083cc36acce8ac62d79",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa40a631b24e00fa383406602e1bcdddffeb390f153833c51107f5faf6863c0a9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
@@ -568,14 +695,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a306",
+                "balance" : "0x4563918244f4a072",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635cfa",
+                "balance" : "0x0de0b6b3a7635f8e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE_d0g0v0.json
index 3b7e8b5cb..cf56c62cc 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecall_10_OOGE_d0g0v0_EIP150" : {
+    "callcodecall_10_OOGE_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/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0x9765d1d62b64575a8187a3307e16c3e445b16c4f342e211fae7e21ad02b6e538",
-                    "mixHash" : "0xa6f3b47fdea96a9233942ccef4abd5ca600780e2d0bcc6d3d10734d18cda1ab1",
-                    "nonce" : "0xde6e400be745915d",
+                    "hash" : "0xe4492705129d2fce4f0a3b0c0470bbba63357d2cef865616e73acafea20d72d9",
+                    "mixHash" : "0xf4bfd7ef4f8a0ca075bb9ec26c94fea5d039606710cfb78b7c0408b149dfb101",
+                    "nonce" : "0xb135d0c926cdf5cb",
                     "number" : "0x01",
                     "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "0x9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
-                    "stateRoot" : "0xbe42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049ae",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0x873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0a6f3b47fdea96a9233942ccef4abd5ca600780e2d0bcc6d3d10734d18cda1ab188de6e400be745915df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0f4bfd7ef4f8a0ca075bb9ec26c94fea5d039606710cfb78b7c0408b149dfb10188b135d0c926cdf5cbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9765d1d62b64575a8187a3307e16c3e445b16c4f342e211fae7e21ad02b6e538",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe4492705129d2fce4f0a3b0c0470bbba63357d2cef865616e73acafea20d72d9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -133,10 +140,10 @@
             }
         }
     },
-    "callcodecall_10_OOGE_d0g0v0_EIP158" : {
+    "callcodecall_10_OOGE_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/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -148,9 +155,150 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0x6c20c6c2160a3a101c7663a41f1a6ceb9cb48bf37677db29d37705f6811b75fb",
-                    "mixHash" : "0x8201179f1e286cdf9cb5b58107a06b35b0ff1ee6fdc2f21c8c040fbc145ff706",
-                    "nonce" : "0x82e0a17f26beaa68",
+                    "hash" : "0x1bb9c6132f06967f790bd4a2eab8ce8fdaed5ca768ffed7679f7ff7c57fa3d19",
+                    "mixHash" : "0x95e594611a441ea3c4254b925031319a438b7dcb3914d6064d55e5e808cd4c80",
+                    "nonce" : "0x8032a3833a8de93d",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0x873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a095e594611a441ea3c4254b925031319a438b7dcb3914d6064d55e5e808cd4c80888032a3833a8de93df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1bb9c6132f06967f790bd4a2eab8ce8fdaed5ca768ffed7679f7ff7c57fa3d19",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50798",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762f868",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecall_10_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x5824a94a4113c5ee6bafbe961f52f57f150c035c7c94638186f28fbc9c41e565",
+                    "mixHash" : "0xab4283dde0f25db358b4e76d44b57caeca31e654e22d39c5c2f9c76e55c78272",
+                    "nonce" : "0x34888912814ba573",
                     "number" : "0x01",
                     "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
                     "receiptTrie" : "0x9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
@@ -159,7 +307,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a08201179f1e286cdf9cb5b58107a06b35b0ff1ee6fdc2f21c8c040fbc145ff7068882e0a17f26beaa68f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0ab4283dde0f25db358b4e76d44b57caeca31e654e22d39c5c2f9c76e55c782728834888912814ba573f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -196,8 +344,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c20c6c2160a3a101c7663a41f1a6ceb9cb48bf37677db29d37705f6811b75fb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5824a94a4113c5ee6bafbe961f52f57f150c035c7c94638186f28fbc9c41e565",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -267,10 +415,10 @@
             }
         }
     },
-    "callcodecall_10_OOGE_d0g0v0_Frontier" : {
+    "callcodecall_10_OOGE_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/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +429,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010270",
-                    "hash" : "0xd7fd5493e1e1b68cbd2a2332fc91502088d28e0d63a0b984865e71e482b51493",
-                    "mixHash" : "0xb74a8bc96439bb47ae3bb3f3ca12e17d08c15dd86d0406ba875f62450a7b138c",
-                    "nonce" : "0x213ae8f7bb11f96d",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x725e673705687204eac5b121d83a98a1543aaa5f2bccfedce4d9ba0e6cdb91c3",
+                    "mixHash" : "0xd21307c41bcb23525601b0774bd4798235b9b4b0305990920141bc6b0f8e6497",
+                    "nonce" : "0x617682d8ed2978e4",
                     "number" : "0x01",
                     "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "0xa9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
-                    "stateRoot" : "0xc23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05a",
+                    "receiptTrie" : "0x9b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662",
+                    "stateRoot" : "0xbe42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049ae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0b74a8bc96439bb47ae3bb3f3ca12e17d08c15dd86d0406ba875f62450a7b138c88213ae8f7bb11f96df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be42cf8f46fab05d875afe066db80fde066218409de0df46a323cbced06049aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b504c3ee508f69978063107d751e6b06b10105f75d01e20a5aa197a64054662b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0d21307c41bcb23525601b0774bd4798235b9b4b0305990920141bc6b0f8e649788617682d8ed2978e4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -330,8 +478,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7fd5493e1e1b68cbd2a2332fc91502088d28e0d63a0b984865e71e482b51493",
-        "network" : "Frontier",
+        "lastblockhash" : "0x725e673705687204eac5b121d83a98a1543aaa5f2bccfedce4d9ba0e6cdb91c3",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,14 +504,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50270",
+                "balance" : "0x4563918244f50798",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd90",
+                "balance" : "0x0de0b6b3a762f868",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -401,10 +549,10 @@
             }
         }
     },
-    "callcodecall_10_OOGE_d0g0v0_Homestead" : {
+    "callcodecall_10_OOGE_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/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -416,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "0xe9efe3d201fc6f66d88d596084f61d3345fb7acf80f5d03c0632d66dfccdf746",
-                    "mixHash" : "0x367cc8d87923ef67d8e9c0eaf4569cdda6cb52dbf9b710ed3d8ab09dc89d4c9d",
-                    "nonce" : "0x58757d0ce57d8bf2",
+                    "hash" : "0x45dacc8fca49443385ab68c83508859ed7c26712fd094b38a9b7eb2c1b53879e",
+                    "mixHash" : "0x30e6dd733ea56fbf2e48252553d88aadedfc1d02c12aedf4dc67cd7d5ebc08b4",
+                    "nonce" : "0x9effe34326863e6c",
                     "number" : "0x01",
                     "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
                     "receiptTrie" : "0xa9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
@@ -427,7 +575,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0367cc8d87923ef67d8e9c0eaf4569cdda6cb52dbf9b710ed3d8ab09dc89d4c9d8858757d0ce57d8bf2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a030e6dd733ea56fbf2e48252553d88aadedfc1d02c12aedf4dc67cd7d5ebc08b4889effe34326863e6cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -464,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9efe3d201fc6f66d88d596084f61d3345fb7acf80f5d03c0632d66dfccdf746",
-        "network" : "Homestead",
+        "lastblockhash" : "0x45dacc8fca49443385ab68c83508859ed7c26712fd094b38a9b7eb2c1b53879e",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -535,10 +683,10 @@
             }
         }
     },
-    "callcodecall_10_OOGE_d0g0v0_Metropolis" : {
+    "callcodecall_10_OOGE_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/stCallCodes/callcodecall_10_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -549,19 +697,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010798",
-                    "hash" : "0x779df45e36e94be87b77d32cf1f430f4f6340e6dd04bb560998b5065dd537255",
-                    "mixHash" : "0xa58fb56747d89980a4610a72c1c666c3cd6431206e5f1ef3b5e66fdcf8a40e17",
-                    "nonce" : "0xa0f3476c09034f42",
+                    "gasUsed" : "0x010270",
+                    "hash" : "0xe794e1c705041bffaef60c2c12a58a835fe8c52f3b61a0609c150ebe50f27be7",
+                    "mixHash" : "0x95bd88e3b49072b02a8dfc4a50321d72d7da6ca52b8857dfdb6574765ec352cd",
+                    "nonce" : "0xec94c045c43144fd",
                     "number" : "0x01",
                     "parentHash" : "0x7e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765",
-                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
-                    "stateRoot" : "0x873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62f",
+                    "receiptTrie" : "0xa9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1",
+                    "stateRoot" : "0xc23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0873d3ad663f51f8014732ec069302d0e4a00cd1d4f57aaa1fd8ab7c5a9f4f62fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0a58fb56747d89980a4610a72c1c666c3cd6431206e5f1ef3b5e66fdcf8a40e1788a0f3476c09034f42f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a07e9bc2a06f2d7d76209757d4b7d09bfa18c46e690f32b82a34f684f525e8b765a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c23e810d8ab429560d04bdedbddf72a79e9910fb055bafeac85a0695cc16b05aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a9f17cb40dbb3da9dcec2ad620b1afd2f87effc45fb6abd1e8069ae0a25195e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a095bd88e3b49072b02a8dfc4a50321d72d7da6ca52b8857dfdb6574765ec352cd88ec94c045c43144fdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -598,16 +746,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ddea46196aa21d0f07f42ac336cfd37c3dabe3c5ba55ecc0a3d00a66fe61211a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x779df45e36e94be87b77d32cf1f430f4f6340e6dd04bb560998b5065dd537255",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe794e1c705041bffaef60c2c12a58a835fe8c52f3b61a0609c150ebe50f27be7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -631,14 +772,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50798",
+                "balance" : "0x4563918244f50270",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f868",
+                "balance" : "0x0de0b6b3a762fd90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0.json
index cfb7dacc0..d5a25973a 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecall_10_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecall_10_SuicideEnd_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/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0xc35fa491752c84b5b35c5e8a1d118a3d73de28c62d180901f0edaab3b8e6ca19",
-                    "mixHash" : "0xa10e733bc7f1ba5f09c00341c02f870828e9a3aca758ef9c34e3d17a5224ba3f",
-                    "nonce" : "0x674c93af24892c15",
+                    "hash" : "0xe34aeaf51c46e6377134f8d539a487924dd7f7467f1bbf1ee29d509e2f7ac90a",
+                    "mixHash" : "0xf3a6eadd3749ebbd67ef85559e3c18bc4e71d5fdd81ab31bf22710be8b995482",
+                    "nonce" : "0x7a5f712b26e87a46",
                     "number" : "0x01",
                     "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "0x85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
-                    "stateRoot" : "0x90d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x0a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0a10e733bc7f1ba5f09c00341c02f870828e9a3aca758ef9c34e3d17a5224ba3f88674c93af24892c15f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0f3a6eadd3749ebbd67ef85559e3c18bc4e71d5fdd81ab31bf22710be8b995482887a5f712b26e87a46f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc35fa491752c84b5b35c5e8a1d118a3d73de28c62d180901f0edaab3b8e6ca19",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe34aeaf51c46e6377134f8d539a487924dd7f7467f1bbf1ee29d509e2f7ac90a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
@@ -126,10 +133,144 @@
             }
         }
     },
-    "callcodecall_10_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecall_10_SuicideEnd_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0x974139be952a372040552ba0de51a922283f8680dff80dfd5f0c1f799d67769b",
+                    "mixHash" : "0x8570781a0c4dab62f2e0ecdd4387e761bafa98ef0e20d5a4a28d97e47a8e8398",
+                    "nonce" : "0x6335c2315090a4bd",
+                    "number" : "0x01",
+                    "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x0a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a08570781a0c4dab62f2e0ecdd4387e761bafa98ef0e20d5a4a28d97e47a8e8398886335c2315090a4bdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x974139be952a372040552ba0de51a922283f8680dff80dfd5f0c1f799d67769b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f7ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630813",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecall_10_SuicideEnd_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/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -141,9 +282,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x3c8f8f377b238cbf389bc6354c2e96745b44d8043b741ee02a1239be83f50af6",
-                    "mixHash" : "0x554a8be3fbc56022b272856ab3462dc1fcf9de799adc8e352188374bd22d652c",
-                    "nonce" : "0x939d737e8bf0eaff",
+                    "hash" : "0x845c6eb5333801743a98ee8534f0af8e1b2a1386b8ed4e0bbd25b0a123094913",
+                    "mixHash" : "0x8ed0b398644051875ff1cef1652badcdee7a600ffac468d83654e4a2abbe9b5d",
+                    "nonce" : "0x5f857f0b065ab0b4",
                     "number" : "0x01",
                     "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
                     "receiptTrie" : "0x85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
@@ -152,7 +293,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0554a8be3fbc56022b272856ab3462dc1fcf9de799adc8e352188374bd22d652c88939d737e8bf0eafff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a08ed0b398644051875ff1cef1652badcdee7a600ffac468d83654e4a2abbe9b5d885f857f0b065ab0b4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,8 +330,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c8f8f377b238cbf389bc6354c2e96745b44d8043b741ee02a1239be83f50af6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x845c6eb5333801743a98ee8534f0af8e1b2a1386b8ed4e0bbd25b0a123094913",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -253,10 +394,10 @@
             }
         }
     },
-    "callcodecall_10_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecall_10_SuicideEnd_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/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -267,19 +408,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3d",
-                    "hash" : "0xbcde9c007fb0191ddb1e7b0684084f58e450cb803258a9e8f4915640949fdef0",
-                    "mixHash" : "0x8987b18fec7a305074ea92c45ca29ac1acc220441eb5c12f8a4a3897bf2f3c31",
-                    "nonce" : "0x546fde69051fed11",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0x82e6ee3cfa402b1e68373e68763342b513eb7164e85f77e8ebc0da1ea358c43d",
+                    "mixHash" : "0x71b270d8cebf2e47d94f183a001d00945ed50999278d7883405d309e3b0c408b",
+                    "nonce" : "0xd59a9f1138517df7",
                     "number" : "0x01",
                     "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "0x937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
-                    "stateRoot" : "0x1cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aa",
+                    "receiptTrie" : "0x85924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fc",
+                    "stateRoot" : "0x90d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a08987b18fec7a305074ea92c45ca29ac1acc220441eb5c12f8a4a3897bf2f3c3188546fde69051fed11f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090d950ac1eda938c2b8c6dbce037f57b2b9a0c94ba107bb835db18a323a10da3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085924e954180c9c8dfb31939caef07c45de6464bd46b6cf3047c7e5d70d193fcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a071b270d8cebf2e47d94f183a001d00945ed50999278d7883405d309e3b0c408b88d59a9f1138517df7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,8 +457,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcde9c007fb0191ddb1e7b0684084f58e450cb803258a9e8f4915640949fdef0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x82e6ee3cfa402b1e68373e68763342b513eb7164e85f77e8ebc0da1ea358c43d",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -335,14 +476,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3d",
+                "balance" : "0x4563918244f4f7ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c3",
+                "balance" : "0x0de0b6b3a7630813",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -380,10 +521,10 @@
             }
         }
     },
-    "callcodecall_10_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecall_10_SuicideEnd_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/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -395,9 +536,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0x72ee3a7424b0d9402d4cd504cb6f0dab8a0a7478fe803a53c4e251b37fc9c7ef",
-                    "mixHash" : "0xa779c507d0c185dfa2c010295eccf9c5bc313462fd10de0c3570a29a41410ad3",
-                    "nonce" : "0x0abff034869e393a",
+                    "hash" : "0x1354f5569b78a703a90ebfcb08d50cfe5be2e14294a7527fd7e27de64e3d6f06",
+                    "mixHash" : "0x434950a10d1e1a4aef7468ddb00bbc06d737eea5820c51abf51f8e8f1dccf15b",
+                    "nonce" : "0x753cc982d403070e",
                     "number" : "0x01",
                     "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
                     "receiptTrie" : "0x937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
@@ -406,7 +547,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0a779c507d0c185dfa2c010295eccf9c5bc313462fd10de0c3570a29a41410ad3880abff034869e393af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0434950a10d1e1a4aef7468ddb00bbc06d737eea5820c51abf51f8e8f1dccf15b88753cc982d403070ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -443,8 +584,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72ee3a7424b0d9402d4cd504cb6f0dab8a0a7478fe803a53c4e251b37fc9c7ef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1354f5569b78a703a90ebfcb08d50cfe5be2e14294a7527fd7e27de64e3d6f06",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -507,10 +648,10 @@
             }
         }
     },
-    "callcodecall_10_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecall_10_SuicideEnd_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/stCallCodes/callcodecall_10_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -521,19 +662,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ed",
-                    "hash" : "0xd55d86fcbd28fae9aa9e14ea2169d51f667bc6b4d1d09ec7235e1a1aefe8fc18",
-                    "mixHash" : "0xb4c07064a01263d2fa4c808f44c8ad4ae53613bcd019d17f5912aa1d57683572",
-                    "nonce" : "0x0be1bd20a2ab50f2",
+                    "gasUsed" : "0xdf3d",
+                    "hash" : "0x73f550acc0c4ed3ef7ebb9e2b3ce41dc393eb2c8a314fbc27bb28215f52dd450",
+                    "mixHash" : "0x9c6674e5cfb4f67bead547512b38f2f09c7f88036e446fd60d2953f5a016a202",
+                    "nonce" : "0x9a969d7182c08bd1",
                     "number" : "0x01",
                     "parentHash" : "0xf4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8d",
-                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
-                    "stateRoot" : "0x0a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3e",
+                    "receiptTrie" : "0x937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7",
+                    "stateRoot" : "0x1cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a075046f393937b867deea635f5953c4afd2c0baf587ddbcf05ba08d88d2e3ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0b4c07064a01263d2fa4c808f44c8ad4ae53613bcd019d17f5912aa1d57683572880be1bd20a2ab50f2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0f4c286a82185917442d9026f6749480e5dd3fb411adb09d972c4a3f12f9f2b8da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01cc0d0739cc4d3ebde79c51d13c9a736608ecbfb1977e19a6cf463c0728239aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0937ac7006289079a3b10d71178254febe00da135a2e23214f8f3b9473a2fdad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a09c6674e5cfb4f67bead547512b38f2f09c7f88036e446fd60d2953f5a016a202889a969d7182c08bd1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -570,16 +711,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08813b7ad9867b00f6a412b3d6422ead53e94dc9a8131ffb3028d6c594954cabba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd55d86fcbd28fae9aa9e14ea2169d51f667bc6b4d1d09ec7235e1a1aefe8fc18",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x73f550acc0c4ed3ef7ebb9e2b3ce41dc393eb2c8a314fbc27bb28215f52dd450",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
@@ -596,14 +730,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ed",
+                "balance" : "0x4563918244f4df3d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630813",
+                "balance" : "0x0de0b6b3a76320c3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_d0g0v0.json
index 8f7b7d7f0..1f4c9df06 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecall_10_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecall_10_d0g0v0_EIP150" : {
+    "callcodecall_10_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/stCallCodes/callcodecall_10_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0x635c69895fde22a3242b71c3fc4f258201d28543f4da8f0f44e36728d6583300",
-                    "mixHash" : "0x95aa5aa5a995208a53a5df1a3d533542adabbdf1512931c88280515584f3cfc5",
-                    "nonce" : "0x2a405d53e29af1ed",
+                    "hash" : "0x0015b02716d325cdeeefdbd82a09d78178f63c887c01099887397c5adaa7d38f",
+                    "mixHash" : "0x13e098dc4dae3eac508d1de65376798327e8f827b643542324ffca683d8391c5",
+                    "nonce" : "0xb629eb5dca863245",
                     "number" : "0x01",
                     "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "0x9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
-                    "stateRoot" : "0xdc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x35dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a095aa5aa5a995208a53a5df1a3d533542adabbdf1512931c88280515584f3cfc5882a405d53e29af1edf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a013e098dc4dae3eac508d1de65376798327e8f827b643542324ffca683d8391c588b629eb5dca863245f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x635c69895fde22a3242b71c3fc4f258201d28543f4da8f0f44e36728d6583300",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0015b02716d325cdeeefdbd82a09d78178f63c887c01099887397c5adaa7d38f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -142,10 +149,160 @@
             }
         }
     },
-    "callcodecall_10_d0g0v0_EIP158" : {
+    "callcodecall_10_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecall_10_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x0ff2bb5c032188dab89cea4eb68e8031894b99754cfe067bf8e4b6b30930aae0",
+                    "mixHash" : "0x3d7d16f5ce18e9e9a59dba42d36621ce80bd4e377394537790edc608d940920e",
+                    "nonce" : "0x70f9a4ca3aa3ee6b",
+                    "number" : "0x01",
+                    "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x35dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a03d7d16f5ce18e9e9a59dba42d36621ce80bd4e377394537790edc608d940920e8870f9a4ca3aa3ee6bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0ff2bb5c032188dab89cea4eb68e8031894b99754cfe067bf8e4b6b30930aae0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763fffe",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000000",
+                    "0x07" : "0x02",
+                    "0xe6" : "0x1000000000000000000000000000000000000002",
+                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0xec" : "0x40",
+                    "0xee" : "0x21",
+                    "0xf0" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f7997d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7606683",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecall_10_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/stCallCodes/callcodecall_10_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -157,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0xe1eea430f6516fb4dae389ee05d4b5b5464ec27eb1d2a47b99d48e8854f00152",
-                    "mixHash" : "0x1f5f8e95d599409432f3df0b428bb639eccfa1635076414618c5c14fbc38c50f",
-                    "nonce" : "0xff916f1a96ac39fd",
+                    "hash" : "0x87a37e529356c1629df29cb260954111931e1717ab0a610451d973cf2f10c6d2",
+                    "mixHash" : "0x77b6fe600566d6aaac6323e13844a1da30170db493e7231cfa2420b66a25f2ea",
+                    "nonce" : "0x1a8abe1a796a0a43",
                     "number" : "0x01",
                     "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
                     "receiptTrie" : "0x9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
@@ -168,7 +325,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a01f5f8e95d599409432f3df0b428bb639eccfa1635076414618c5c14fbc38c50f88ff916f1a96ac39fdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a077b6fe600566d6aaac6323e13844a1da30170db493e7231cfa2420b66a25f2ea881a8abe1a796a0a43f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -205,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1eea430f6516fb4dae389ee05d4b5b5464ec27eb1d2a47b99d48e8854f00152",
-        "network" : "EIP158",
+        "lastblockhash" : "0x87a37e529356c1629df29cb260954111931e1717ab0a610451d973cf2f10c6d2",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -285,10 +442,10 @@
             }
         }
     },
-    "callcodecall_10_d0g0v0_Frontier" : {
+    "callcodecall_10_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/stCallCodes/callcodecall_10_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -299,19 +456,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x039455",
-                    "hash" : "0x6433ba8e49fa6c2ffa13a6f5356fb6eeb7ee5cc0706a9185b75bb336bcf0dabe",
-                    "mixHash" : "0x0132948a6f70059b5ac0a70813551fd4c38c7aee90ac0fac9ff6725cd387d0bb",
-                    "nonce" : "0x2fe4f70e00c8e3ce",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x014d3c82b99df26b28603f6da417d4fffaa351132fe9d0671fa03d1678ac8634",
+                    "mixHash" : "0x0a732cff6fe04dd9890e8bd8cc42817bae1ba33fe50da81605411b025dd06e6c",
+                    "nonce" : "0x5475e3e9eccfe10c",
                     "number" : "0x01",
                     "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "0x502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
-                    "stateRoot" : "0x18c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30",
+                    "receiptTrie" : "0x9b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591",
+                    "stateRoot" : "0xdc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a00132948a6f70059b5ac0a70813551fd4c38c7aee90ac0fac9ff6725cd387d0bb882fe4f70e00c8e3cef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc9f477de06a01e74500648fe545b7e999f2401859891fca6fd44e79946c4737a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b17e7d1ad4b27088a4495040750f5756b48a7284bbf0d26fe8e4919548ca591b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a00a732cff6fe04dd9890e8bd8cc42817bae1ba33fe50da81605411b025dd06e6c885475e3e9eccfe10cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -348,8 +505,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6433ba8e49fa6c2ffa13a6f5356fb6eeb7ee5cc0706a9185b75bb336bcf0dabe",
-        "network" : "Frontier",
+        "lastblockhash" : "0x014d3c82b99df26b28603f6da417d4fffaa351132fe9d0671fa03d1678ac8634",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -383,14 +540,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79455",
+                "balance" : "0x4563918244f7997d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606bab",
+                "balance" : "0x0de0b6b3a7606683",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -428,10 +585,10 @@
             }
         }
     },
-    "callcodecall_10_d0g0v0_Homestead" : {
+    "callcodecall_10_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/stCallCodes/callcodecall_10_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -443,9 +600,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "0xc837ce4c6659eb1b7b25dec92080a0bf1eda513def145b4ea9081b5b82802667",
-                    "mixHash" : "0x2bb21a58bc977215a537b9d38877a7ba4d3dca457f75c335609fabeeb9a8d0a2",
-                    "nonce" : "0x6b5d686a4393e2e2",
+                    "hash" : "0xf7060914c3257c42e4ecd882cf32dc6625893c0a0c3fcc717a1cf2f79f7a5429",
+                    "mixHash" : "0x9cd69b74d2c6b604591154338af4a453257b825adf491166d12e20690a69fabc",
+                    "nonce" : "0x50f9dd0f3101c9da",
                     "number" : "0x01",
                     "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
                     "receiptTrie" : "0x502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
@@ -454,7 +611,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a02bb21a58bc977215a537b9d38877a7ba4d3dca457f75c335609fabeeb9a8d0a2886b5d686a4393e2e2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a09cd69b74d2c6b604591154338af4a453257b825adf491166d12e20690a69fabc8850f9dd0f3101c9daf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -491,8 +648,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc837ce4c6659eb1b7b25dec92080a0bf1eda513def145b4ea9081b5b82802667",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf7060914c3257c42e4ecd882cf32dc6625893c0a0c3fcc717a1cf2f79f7a5429",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -571,10 +728,10 @@
             }
         }
     },
-    "callcodecall_10_d0g0v0_Metropolis" : {
+    "callcodecall_10_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/stCallCodes/callcodecall_10_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,19 +742,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03997d",
-                    "hash" : "0xf8e6da08397ee4e8c5ae20364d7e2c540614bf3a2efc1e566f87ce6873a86f1f",
-                    "mixHash" : "0x6c94666545324ccd65aa39b9efe9abba310e26b409b67aa2c4f4b3a96e1836c2",
-                    "nonce" : "0xd114c345f11111f3",
+                    "gasUsed" : "0x039455",
+                    "hash" : "0x6d22a1511f9bd80baacb399daa7f9f1fd89cf655433310a38839f8b914ba5860",
+                    "mixHash" : "0x5953897ebe5bda191dc5c76609d3542bf2b005cd0dea337fd65b3b94fdbb0ed2",
+                    "nonce" : "0x727288fff9c575da",
                     "number" : "0x01",
                     "parentHash" : "0x35d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fb",
-                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
-                    "stateRoot" : "0x35dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32",
+                    "receiptTrie" : "0x502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0e",
+                    "stateRoot" : "0x18c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035dbb90de94ebfa49c657a8837755714d1ad73d2e2337378e20a8ceaf3cd7b32a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a06c94666545324ccd65aa39b9efe9abba310e26b409b67aa2c4f4b3a96e1836c288d114c345f11111f3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a035d561107a0247f4b5866c3aed67fc5f2928d501855067d0437b29732d2206fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c6d014ec68350861feb79b297686aa734a9b2ef0ac1fc756e0f2fec210bc30a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0502c34a7fe54566fd854ae512f61a0026a2ef3cc5c653762eaacc6bfc602cd0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a05953897ebe5bda191dc5c76609d3542bf2b005cd0dea337fd65b3b94fdbb0ed288727288fff9c575daf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -634,16 +791,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2f1b5b3faed93a50f8efe19bbc40d0f6564d8dcf0b0990d6b3a075c7028def1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8e6da08397ee4e8c5ae20364d7e2c540614bf3a2efc1e566f87ce6873a86f1f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6d22a1511f9bd80baacb399daa7f9f1fd89cf655433310a38839f8b914ba5860",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -676,14 +826,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7997d",
+                "balance" : "0x4563918244f79455",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606683",
+                "balance" : "0x0de0b6b3a7606bab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE_d0g0v0.json
index 529fa5a89..de22d39c2 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_100_OOGE_d0g0v0_EIP150" : {
+    "callcodecallcall_100_OOGE_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/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0xe3008a15a57f11abcb9bc29c4240a5d2a7ed01ab5248d9c344b059ac94233ee3",
-                    "mixHash" : "0x57f8774734054bf8a8f70cd1b6c96ac652f6f27753db017c153f79ff4dc668d2",
-                    "nonce" : "0x54509aa57875524f",
+                    "hash" : "0xdf77a75693f28951b963f6ee1d52a636dcef8c4dd141bd56ccda2ba94d287624",
+                    "mixHash" : "0x9d8fbfbbe2be93509f5bfc37da6cf33ed2e7054451e238dfcf7e0977f01ad160",
+                    "nonce" : "0xd1e62d6945e8ff8f",
                     "number" : "0x01",
                     "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "0x9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
-                    "stateRoot" : "0x51d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91c",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x2cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a057f8774734054bf8a8f70cd1b6c96ac652f6f27753db017c153f79ff4dc668d28854509aa57875524ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a09d8fbfbbe2be93509f5bfc37da6cf33ed2e7054451e238dfcf7e0977f01ad16088d1e62d6945e8ff8ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3008a15a57f11abcb9bc29c4240a5d2a7ed01ab5248d9c344b059ac94233ee3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdf77a75693f28951b963f6ee1d52a636dcef8c4dd141bd56ccda2ba94d287624",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcodecallcall_100_OOGE_d0g0v0_EIP158" : {
+    "callcodecallcall_100_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0xec16831c886d6d3ed39d8f5fe2500ac6ab4bd0bc61a493fc88d7836d054f2df7",
+                    "mixHash" : "0x0066c3729db73b504314dbd42e16fa2c69348f084f88cbec4478d26639271bb7",
+                    "nonce" : "0x65ee6a3b07a4cc4d",
+                    "number" : "0x01",
+                    "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x2cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a00066c3729db73b504314dbd42e16fa2c69348f084f88cbec4478d26639271bb78865ee6a3b07a4cc4df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec16831c886d6d3ed39d8f5fe2500ac6ab4bd0bc61a493fc88d7836d054f2df7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_OOGE_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/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0xc18f5e523e8c2d1b46748f27bf48f73abad011d104d10ebd61d317b686419770",
-                    "mixHash" : "0x46c7d200efe2f9d72efaa7e79e4d00ab8c63963b7c0867b6ae65ba47105dcadc",
-                    "nonce" : "0xef36a184fc383d92",
+                    "hash" : "0x203fec1f865eae241d100de01296c4be14d0062c5a781f9c2fb03e3ee01d9fe9",
+                    "mixHash" : "0xbab0ee6cf559f68c7be1dea55dde7f957e0753107b64828ffc321393decf8af0",
+                    "nonce" : "0xf75c93e879008597",
                     "number" : "0x01",
                     "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
                     "receiptTrie" : "0x9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a046c7d200efe2f9d72efaa7e79e4d00ab8c63963b7c0867b6ae65ba47105dcadc88ef36a184fc383d92f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0bab0ee6cf559f68c7be1dea55dde7f957e0753107b64828ffc321393decf8af088f75c93e879008597f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc18f5e523e8c2d1b46748f27bf48f73abad011d104d10ebd61d317b686419770",
-        "network" : "EIP158",
+        "lastblockhash" : "0x203fec1f865eae241d100de01296c4be14d0062c5a781f9c2fb03e3ee01d9fe9",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGE_d0g0v0_Frontier" : {
+    "callcodecallcall_100_OOGE_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/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0xf00bceb0460e83ed499e54336d4ddde5446ad2fc4c884cfa313f27d4fed91558",
-                    "mixHash" : "0x6b74e586279453609ef92e00ee88cdaccf668ca4a3ad0e6273f4049c9c094b72",
-                    "nonce" : "0x985ad85a2b41ba9a",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x3b80a27196e973115b3d9d57949989c60e5db8bff46b743d1ca91b645532c3a5",
+                    "mixHash" : "0x1b5deacd846750f035cc40f45d14fc63d7268e90552ebefd21dbe49cbca7bbed",
+                    "nonce" : "0x37d043903062072b",
                     "number" : "0x01",
                     "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "0xaa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
-                    "stateRoot" : "0xbd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006",
+                    "receiptTrie" : "0x9a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079e",
+                    "stateRoot" : "0x51d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a06b74e586279453609ef92e00ee88cdaccf668ca4a3ad0e6273f4049c9c094b7288985ad85a2b41ba9af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051d7f4e247c241fd5547cf58d342a0a137a03b0c61027615be86f81233efd91ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a2822b03b8d31de8c28d3dc2e00a6864e75901a5d833bf458c200471eed079eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a01b5deacd846750f035cc40f45d14fc63d7268e90552ebefd21dbe49cbca7bbed8837d043903062072bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf00bceb0460e83ed499e54336d4ddde5446ad2fc4c884cfa313f27d4fed91558",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3b80a27196e973115b3d9d57949989c60e5db8bff46b743d1ca91b645532c3a5",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGE_d0g0v0_Homestead" : {
+    "callcodecallcall_100_OOGE_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/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0xb9e6ae392bd7feb87835c55ce4425cbf9e5b7cbda1f88df2cdb0bde8c39b8654",
-                    "mixHash" : "0x7b4297d15a7a7557d21925cb2e5ce5f5ca26f05cf485517c82633c7ba3333ac3",
-                    "nonce" : "0x0142c0e66280fe79",
+                    "hash" : "0x09e7cea4eca3ef31cb6213c6370df238c2bd9f858677ef7bf8c3f6b0069cc85f",
+                    "mixHash" : "0x1737826d78021f41d25e4f71dce9909e1546dc11b364657163f965e9123028e4",
+                    "nonce" : "0x9ac8a297b424d5d2",
                     "number" : "0x01",
                     "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
                     "receiptTrie" : "0xaa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a07b4297d15a7a7557d21925cb2e5ce5f5ca26f05cf485517c82633c7ba3333ac3880142c0e66280fe79f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a01737826d78021f41d25e4f71dce9909e1546dc11b364657163f965e9123028e4889ac8a297b424d5d2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9e6ae392bd7feb87835c55ce4425cbf9e5b7cbda1f88df2cdb0bde8c39b8654",
-        "network" : "Homestead",
+        "lastblockhash" : "0x09e7cea4eca3ef31cb6213c6370df238c2bd9f858677ef7bf8c3f6b0069cc85f",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGE_d0g0v0_Metropolis" : {
+    "callcodecallcall_100_OOGE_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/stCallCodes/callcodecallcall_100_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0x94b5b2bf4aded96ea54d9e1f73ccee8b174cc0b131682c54f8446f7d32777eb7",
-                    "mixHash" : "0xa4834109bc966e1d4e3f996eaa72c2ef0e32224184c8c70aa37e3e2b7f38ca84",
-                    "nonce" : "0xff11a11cd41a4e8a",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0x00eb13c769b94a05662c74fd183ad7f9916c7a72d3829595618dbca6dbcbd999",
+                    "mixHash" : "0x127400a24f542148f767b112fc22e0f734156f033202f6f0a754a788ba9398af",
+                    "nonce" : "0xe216b8b204f51f42",
                     "number" : "0x01",
                     "parentHash" : "0xc389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0x2cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3b",
+                    "receiptTrie" : "0xaa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163",
+                    "stateRoot" : "0xbd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cf1a27c9b51087d0a608719935d2ae1cac260b1536012aaab9554bd733f7d3ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a4834109bc966e1d4e3f996eaa72c2ef0e32224184c8c70aa37e3e2b7f38ca8488ff11a11cd41a4e8af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c389c713d997876ab75a970c162c61d7718d01cbfb67803e9292adb30db2b9e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3023c88ed1b268652b0d20bfa6cd26748a86526564d0ff1bc5e0becb24f006a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0aa22f1d4290b29a46d206ae5e49b7ca050800a258d191191ce27c3bfa4c7b163b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0127400a24f542148f767b112fc22e0f734156f033202f6f0a754a788ba9398af88e216b8b204f51f42f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f5b47330d0078c4078d62170af26853c3e546f744d48565cbc1fb7e7ac1fe62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94b5b2bf4aded96ea54d9e1f73ccee8b174cc0b131682c54f8446f7d32777eb7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x00eb13c769b94a05662c74fd183ad7f9916c7a72d3829595618dbca6dbcbd999",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0.json
index 3ccc575a9..852beea4d 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_100_OOGMAfter_d0g0v0_EIP150" : {
+    "callcodecallcall_100_OOGMAfter_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/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xfde5457b34eb904dcbcc0508a3474c39b3aea3c470e6c5b8a47d886f137254d4",
-                    "mixHash" : "0x287b54eb336d7a4ca5fc726522b36076bd1d7bfc05389dff50f97c4b006d614f",
-                    "nonce" : "0x2231b8b1d375cb6e",
+                    "hash" : "0x10f125347c38be3f95d243a10ca098853b7af51fb6ef3a1ae2db88b676f0f7ec",
+                    "mixHash" : "0x047d471da409b7410cb56d2f67e5b6b271689484bc9f512f727fbf28faa978ce",
+                    "nonce" : "0x429432dffe190226",
                     "number" : "0x01",
                     "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
-                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xb6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0287b54eb336d7a4ca5fc726522b36076bd1d7bfc05389dff50f97c4b006d614f882231b8b1d375cb6ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0047d471da409b7410cb56d2f67e5b6b271689484bc9f512f727fbf28faa978ce88429432dffe190226f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfde5457b34eb904dcbcc0508a3474c39b3aea3c470e6c5b8a47d886f137254d4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x10f125347c38be3f95d243a10ca098853b7af51fb6ef3a1ae2db88b676f0f7ec",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_d0g0v0_EIP158" : {
+    "callcodecallcall_100_OOGMAfter_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/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xa9cf954db772834ae611e5c4fd7bc290f30e0099050d6e6df7db77ca7c4c780f",
-                    "mixHash" : "0x3125da4079c03f2110243d483322261239ae405ecfdcb80c19c8200c90fc6260",
-                    "nonce" : "0x2e7c628cde01be40",
+                    "hash" : "0xd217d2743a73f28d3db5ee555e3276cc665e0a546ec380e2a96f3505f42e6779",
+                    "mixHash" : "0x02f2bc6dc8ad0b2eb8c569c26b3bfb3700da5ce9f238e6308103d6b6072d53fe",
+                    "nonce" : "0xf7b155f61042bff5",
+                    "number" : "0x01",
+                    "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xb6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a002f2bc6dc8ad0b2eb8c569c26b3bfb3700da5ce9f238e6308103d6b6072d53fe88f7b155f61042bff5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd217d2743a73f28d3db5ee555e3276cc665e0a546ec380e2a96f3505f42e6779",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0xd4907a56dd0e867930d6ffe87b3bda9a67a4359d172f35b8a1b6d9334f099b2a",
+                    "mixHash" : "0xbb0ff317fa1610260a6efa0ba1c590e675d505854d37dbcbddc3b0e073e6c227",
+                    "nonce" : "0x3c09a4419d9927c8",
                     "number" : "0x01",
                     "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
                     "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a03125da4079c03f2110243d483322261239ae405ecfdcb80c19c8200c90fc6260882e7c628cde01be40f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0bb0ff317fa1610260a6efa0ba1c590e675d505854d37dbcbddc3b0e073e6c227883c09a4419d9927c8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9cf954db772834ae611e5c4fd7bc290f30e0099050d6e6df7db77ca7c4c780f",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd4907a56dd0e867930d6ffe87b3bda9a67a4359d172f35b8a1b6d9334f099b2a",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_d0g0v0_Frontier" : {
+    "callcodecallcall_100_OOGMAfter_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/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xea09dbdf3d69b3acdf7bb0828df06b3d5d381c3780df0cea064225821063e745",
-                    "mixHash" : "0xc1e283eb02d0d9aa20a2ac518f72abdd6b59de00340610e6f151f371d0ed1b62",
-                    "nonce" : "0x3d54ec0e447a9367",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x24009ef23248a581a86dd17ae5cded18ecaf93342c7747640808011a51ebf6c3",
+                    "mixHash" : "0x600cc190fadeb5147048388d86bad2e9a2b819e1fcaac646d1469dda805296a4",
+                    "nonce" : "0x1e494e2219e48d0e",
                     "number" : "0x01",
                     "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
-                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
+                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
+                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c1e283eb02d0d9aa20a2ac518f72abdd6b59de00340610e6f151f371d0ed1b62883d54ec0e447a9367f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0600cc190fadeb5147048388d86bad2e9a2b819e1fcaac646d1469dda805296a4881e494e2219e48d0ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea09dbdf3d69b3acdf7bb0828df06b3d5d381c3780df0cea064225821063e745",
-        "network" : "Frontier",
+        "lastblockhash" : "0x24009ef23248a581a86dd17ae5cded18ecaf93342c7747640808011a51ebf6c3",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_d0g0v0_Homestead" : {
+    "callcodecallcall_100_OOGMAfter_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/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x1a38e6b6a3a663104ed0ad8d2ffb7d37eeebd638b29d92103c40b6a3a50ddb80",
-                    "mixHash" : "0x8664291cac8b621170f16f64feb8ddec3c30d65ef7a28ee49473dc26fb93b793",
-                    "nonce" : "0x5d6c901a41d51f91",
+                    "hash" : "0x24d817036ac80ae1228ca16153d6f9cd4e3def3546c75dc5f0f9126bcfcfb642",
+                    "mixHash" : "0x67816c9623500f9827cdc65615e99f5371faddbe6eb742ef973b2d787ebfd168",
+                    "nonce" : "0x719ed3330eed3bbd",
                     "number" : "0x01",
                     "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
                     "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08664291cac8b621170f16f64feb8ddec3c30d65ef7a28ee49473dc26fb93b793885d6c901a41d51f91f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a067816c9623500f9827cdc65615e99f5371faddbe6eb742ef973b2d787ebfd16888719ed3330eed3bbdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a38e6b6a3a663104ed0ad8d2ffb7d37eeebd638b29d92103c40b6a3a50ddb80",
-        "network" : "Homestead",
+        "lastblockhash" : "0x24d817036ac80ae1228ca16153d6f9cd4e3def3546c75dc5f0f9126bcfcfb642",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcodecallcall_100_OOGMAfter_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/stCallCodes/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xe1c58ac00edb7648f896caa859006c6509d17db366d53aeaaa30a38b6193ff6a",
-                    "mixHash" : "0x4f11f0d0e59b76a50e4bce1094a25cef0df3eff82c6b5ba37afce2bdfbe46219",
-                    "nonce" : "0xc33f085785344dfc",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x86db7bfd870835034c1b602e5bbbcf3551167b581559ed6a288003ab005b9197",
+                    "mixHash" : "0x4d8758244ec5cf465d574373d5b6871a55551be37e83cc298ad2374e9292efd4",
+                    "nonce" : "0x4c253dd023e2160a",
                     "number" : "0x01",
                     "parentHash" : "0x461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ff",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0xb6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41",
+                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
+                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a04f11f0d0e59b76a50e4bce1094a25cef0df3eff82c6b5ba37afce2bdfbe4621988c33f085785344dfcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0461609eddbd51ad01d50fd9a56b85cad0a40d2609c69f0df8ec9d98b26de44ffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a04d8758244ec5cf465d574373d5b6871a55551be37e83cc298ad2374e9292efd4884c253dd023e2160af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1c58ac00edb7648f896caa859006c6509d17db366d53aeaaa30a38b6193ff6a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x86db7bfd870835034c1b602e5bbbcf3551167b581559ed6a288003ab005b9197",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0.json
index 5c0001194..51e4f0eca 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_100_OOGMBefore_d0g0v0_EIP150" : {
+    "callcodecallcall_100_OOGMBefore_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/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x6da7f7e632007b86fb4f6ac84cb5fc4d5c6dae33c6a6949460b4dc79c30504fc",
-                    "mixHash" : "0x33ae43955428d1ddb750e34fb1b3b6e6ec9728375184a0e506d8afa2d0962127",
-                    "nonce" : "0x3d3ff4c94b7003eb",
+                    "hash" : "0x9b38d9a76643ec8419a954b2915906c88cf0b8840e9bf0dadd009cb7ef4af594",
+                    "mixHash" : "0x998fce4ad322248d5e09c4f8f7c55585c3b650aec238626603ecea628161ae0f",
+                    "nonce" : "0x29994c6493a5f7c0",
                     "number" : "0x01",
                     "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "0x04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
-                    "stateRoot" : "0x4268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xc01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a033ae43955428d1ddb750e34fb1b3b6e6ec9728375184a0e506d8afa2d0962127883d3ff4c94b7003ebf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0998fce4ad322248d5e09c4f8f7c55585c3b650aec238626603ecea628161ae0f8829994c6493a5f7c0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6da7f7e632007b86fb4f6ac84cb5fc4d5c6dae33c6a6949460b4dc79c30504fc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9b38d9a76643ec8419a954b2915906c88cf0b8840e9bf0dadd009cb7ef4af594",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMBefore_d0g0v0_EIP158" : {
+    "callcodecallcall_100_OOGMBefore_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/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xc9127e3297241b75dfbc6590d97045aa9d63aa1749a2046f38bd9bee288eeade",
-                    "mixHash" : "0x8ccfb7d7ab65b0c673e9970cb86d2828440f46ec5c7abdc86e29cc4fbb6ec67e",
-                    "nonce" : "0xa09ac2552d51fae0",
+                    "hash" : "0x97547f666b266add42743223c3cfe1103f6649536c1f0ea92823c3e528b2cef9",
+                    "mixHash" : "0x9bfa01179d6870164513e6b8190b41890b5b743927c31ae275353f5d872e60c6",
+                    "nonce" : "0x554eb4dae45203af",
+                    "number" : "0x01",
+                    "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xc01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a09bfa01179d6870164513e6b8190b41890b5b743927c31ae275353f5d872e60c688554eb4dae45203aff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x97547f666b266add42743223c3cfe1103f6649536c1f0ea92823c3e528b2cef9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xacf2d780d0492f2c64e256db8dcb0aa4863d35ffd22b1519036b52c37cd0f9ff",
+                    "mixHash" : "0xd0ebc7c130661330cbe20ab2d44286baac8fb263d4b6bddd3f8c189397125206",
+                    "nonce" : "0x0b9cf894ddb8e446",
                     "number" : "0x01",
                     "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
                     "receiptTrie" : "0x04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a08ccfb7d7ab65b0c673e9970cb86d2828440f46ec5c7abdc86e29cc4fbb6ec67e88a09ac2552d51fae0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0d0ebc7c130661330cbe20ab2d44286baac8fb263d4b6bddd3f8c189397125206880b9cf894ddb8e446f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9127e3297241b75dfbc6590d97045aa9d63aa1749a2046f38bd9bee288eeade",
-        "network" : "EIP158",
+        "lastblockhash" : "0xacf2d780d0492f2c64e256db8dcb0aa4863d35ffd22b1519036b52c37cd0f9ff",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMBefore_d0g0v0_Frontier" : {
+    "callcodecallcall_100_OOGMBefore_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/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x8a5a0f3af5e7d3e86bdf9cb35c946dd808cbe1999ed36a242040da408dffacb8",
-                    "mixHash" : "0xb9f8cf6c52d93986e2adfcba3043af94b6d17d9a90d4932fc9ebae29f009bf64",
-                    "nonce" : "0x4a2c97a78ed32c1f",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xa84c3f78b137ae0e84e3ee9456a58ce9cb05e9a8926f812db6b7ca5b22106aab",
+                    "mixHash" : "0x4933d9589983a43daf2684474439a0ad17bdec5363e79edc443f3ca0f2437328",
+                    "nonce" : "0xf8187517ead88915",
                     "number" : "0x01",
                     "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "0xb94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
-                    "stateRoot" : "0xf03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5",
+                    "receiptTrie" : "0x04d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976",
+                    "stateRoot" : "0x4268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b9f8cf6c52d93986e2adfcba3043af94b6d17d9a90d4932fc9ebae29f009bf64884a2c97a78ed32c1ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04268cf8486d56af3f1c1a110a0c643ef1442a1a85943397640035ddad8b8c5a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004d281102f9782f1d75245d66aa227fc3fd8e7e0fccb6591a4b4b119bae6c976b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a04933d9589983a43daf2684474439a0ad17bdec5363e79edc443f3ca0f243732888f8187517ead88915f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a5a0f3af5e7d3e86bdf9cb35c946dd808cbe1999ed36a242040da408dffacb8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa84c3f78b137ae0e84e3ee9456a58ce9cb05e9a8926f812db6b7ca5b22106aab",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMBefore_d0g0v0_Homestead" : {
+    "callcodecallcall_100_OOGMBefore_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/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x0ad6079a02ac9292401e19a2b86d53ea3d763ceb81742abddf34071bb89dd5bd",
-                    "mixHash" : "0x1f5b4d8f8f4decc40367824b4d690de6b86aa10eeea19285c31a8590a80b9fd0",
-                    "nonce" : "0x3bf674a81b619f1b",
+                    "hash" : "0xffcaa15666b96a0ac254b6a0007158508cab8f3ec5b7ce38fcf9e35709aa7afb",
+                    "mixHash" : "0xfc573af1f37a8701879af2ccc84bb301f9ea38758229963868a9753c6b72c9ef",
+                    "nonce" : "0xdee3c5a5b1558f28",
                     "number" : "0x01",
                     "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
                     "receiptTrie" : "0xb94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01f5b4d8f8f4decc40367824b4d690de6b86aa10eeea19285c31a8590a80b9fd0883bf674a81b619f1bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0fc573af1f37a8701879af2ccc84bb301f9ea38758229963868a9753c6b72c9ef88dee3c5a5b1558f28f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ad6079a02ac9292401e19a2b86d53ea3d763ceb81742abddf34071bb89dd5bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xffcaa15666b96a0ac254b6a0007158508cab8f3ec5b7ce38fcf9e35709aa7afb",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcodecallcall_100_OOGMBefore_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/stCallCodes/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0x47d14c3ac894c7fb11238f434e4ff8c656ba8f2295264149e70003798057b9a0",
-                    "mixHash" : "0x57210568106f301d114b60d9a294b26870dfb187d4ed1a247481293d7ab15817",
-                    "nonce" : "0x911df768344b446b",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xceb991b1dad66fe0b7be77291568f3365163db8cf43e5792f1a59a74b36db061",
+                    "mixHash" : "0x25d787b2220fc3bb4b2b07117382e9134b2af761d6477e9f17eda91aad1d300b",
+                    "nonce" : "0x2f911ec9d317c970",
                     "number" : "0x01",
                     "parentHash" : "0x478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0xc01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6d",
+                    "receiptTrie" : "0xb94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bd",
+                    "stateRoot" : "0xf03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c01b13bb3b5d2f0139b9897eb6719a0e8bde4be9fe5ec7bb706e2aa2b5a17d6da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a057210568106f301d114b60d9a294b26870dfb187d4ed1a247481293d7ab1581788911df768344b446bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0478b40459d82cb252764d76247cacb96edf4f23a9d2b49aa62c704a529ef0568a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03ddbedeb973b0e91c0317ad41c843c21491ebfce4608e6ce9e0218026ee3f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b94b6d202eaf3f503c7fdf021b5db849843fa88457c43d394512ebb2f92be6bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a025d787b2220fc3bb4b2b07117382e9134b2af761d6477e9f17eda91aad1d300b882f911ec9d317c970f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dbb9105b69cef47a97dca13b996accfad10f77bb42352666539ac282b2e8dd4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47d14c3ac894c7fb11238f434e4ff8c656ba8f2295264149e70003798057b9a0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xceb991b1dad66fe0b7be77291568f3365163db8cf43e5792f1a59a74b36db061",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0.json
index 5c8feb1d4..59370f69c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_100_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecallcall_100_SuicideEnd_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/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x53ac25adb36b22071e95322ec6f50e7976f29124af3b77fae6f28c492dfdbcfb",
-                    "mixHash" : "0x3098f660e97e1dc776fbff89857e1b08fd2ddffed788d796e3b1bb301d573a8f",
-                    "nonce" : "0xb2fb2e1769769e6b",
+                    "hash" : "0x31e19aff1e728eeabecdeb193b2aebddf6efd501e07d6add8a778ddb7797cc25",
+                    "mixHash" : "0xc0225224932a939e29a97eeea5de200397bda2f45fcaee151bc3ee97755e0a86",
+                    "nonce" : "0x7921134df211079b",
                     "number" : "0x01",
                     "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "0xad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
-                    "stateRoot" : "0xa0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9c",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x74b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a03098f660e97e1dc776fbff89857e1b08fd2ddffed788d796e3b1bb301d573a8f88b2fb2e1769769e6bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0c0225224932a939e29a97eeea5de200397bda2f45fcaee151bc3ee97755e0a86887921134df211079bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53ac25adb36b22071e95322ec6f50e7976f29124af3b77fae6f28c492dfdbcfb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x31e19aff1e728eeabecdeb193b2aebddf6efd501e07d6add8a778ddb7797cc25",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -142,10 +149,160 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecallcall_100_SuicideEnd_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0xc0075bad50f0aafcee2d904eac20d9825feac218bba1c935b9d54c3d253b79f0",
+                    "mixHash" : "0x263be4ab4a4f972cf3a6509d5e8ff20e8df31b86266cd5391c405f6444f35a10",
+                    "nonce" : "0xedf515d41fa8dbd1",
+                    "number" : "0x01",
+                    "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x74b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0263be4ab4a4f972cf3a6509d5e8ff20e8df31b86266cd5391c405f6444f35a1088edf515d41fa8dbd1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xafe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269ed",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc0075bad50f0aafcee2d904eac20d9825feac218bba1c935b9d54c3d253b79f0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x04a817c800",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_SuicideEnd_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/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -157,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x5582fb05fbc21ebea20ba8692905c3cf945ff3488a4ee4c843bb74519ad55ef6",
-                    "mixHash" : "0xdabb2aa10795b12695f7e2234e366c9b058fc6c1d874fef55c1bf74b78bfe2a2",
-                    "nonce" : "0x30d1c941e9eef2c1",
+                    "hash" : "0xc8fee67ce04d68d279ef62511bf45e3dcfd9fd42f16004cdc579a1c0b805e9f8",
+                    "mixHash" : "0x346f7fbdbcd861cf46c95644c0056507fbe9f43b76e06beffb7e319df9b584a9",
+                    "nonce" : "0xe4278eb36cde2566",
                     "number" : "0x01",
                     "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
                     "receiptTrie" : "0xad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
@@ -168,7 +325,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0dabb2aa10795b12695f7e2234e366c9b058fc6c1d874fef55c1bf74b78bfe2a28830d1c941e9eef2c1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0346f7fbdbcd861cf46c95644c0056507fbe9f43b76e06beffb7e319df9b584a988e4278eb36cde2566f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -205,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5582fb05fbc21ebea20ba8692905c3cf945ff3488a4ee4c843bb74519ad55ef6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc8fee67ce04d68d279ef62511bf45e3dcfd9fd42f16004cdc579a1c0b805e9f8",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -285,10 +442,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecallcall_100_SuicideEnd_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/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -299,19 +456,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0x91d362175b4b8ea8d3c742d608c449e4c0dd0e8a8b5107ed1449e47058e98044",
-                    "mixHash" : "0x1a8da9d4306fe47ab99971c813c0a88fd1b1fbca3a48aafb6230236d74ea53e9",
-                    "nonce" : "0x1b5cb3432cede2b9",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0xf2782f3f380774f13caf56856c98b47e8e633d08b60dec46f0c67db64e8191ca",
+                    "mixHash" : "0xf9fff748ecec9d98ec2a59c9236cc651977463cf072153ee9eb4a5a27d230c67",
+                    "nonce" : "0x45dcdec68a806319",
                     "number" : "0x01",
                     "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "0x28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
-                    "stateRoot" : "0x8ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217ac",
+                    "receiptTrie" : "0xad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881dda",
+                    "stateRoot" : "0xa0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a01a8da9d4306fe47ab99971c813c0a88fd1b1fbca3a48aafb6230236d74ea53e9881b5cb3432cede2b9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d8779e3fbc2e2886e53003a999092383a92a930604316a2aa2aa61cc3c6e9ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ad88e4108cf072babefa51eb0abbd8c3a15dd0bf0d76ed8efef7c556f7881ddab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0f9fff748ecec9d98ec2a59c9236cc651977463cf072153ee9eb4a5a27d230c678845dcdec68a806319f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -348,8 +505,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91d362175b4b8ea8d3c742d608c449e4c0dd0e8a8b5107ed1449e47058e98044",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf2782f3f380774f13caf56856c98b47e8e633d08b60dec46f0c67db64e8191ca",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -376,14 +533,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -428,10 +585,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecallcall_100_SuicideEnd_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/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -443,9 +600,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0x5e5c7a3a25b8ddea664697319f45abdf9da62283b6b7c6025f51907b9885b06c",
-                    "mixHash" : "0xebf69e7e0fa8567e42d9376dbd2b69c341b097125acd9106d4fd97b6a4f5c245",
-                    "nonce" : "0xb828667aaa2e9cfa",
+                    "hash" : "0x60499749cbf2991a6733f2b82858ee1a24777963302dabdf884d8ee0e3fc53bd",
+                    "mixHash" : "0x7063886bf58e53480a96c170fc83170893dfa9adad68ea1c139d487338661ff9",
+                    "nonce" : "0x7e81ecb85f3cd22e",
                     "number" : "0x01",
                     "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
                     "receiptTrie" : "0x28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
@@ -454,7 +611,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0ebf69e7e0fa8567e42d9376dbd2b69c341b097125acd9106d4fd97b6a4f5c24588b828667aaa2e9cfaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a07063886bf58e53480a96c170fc83170893dfa9adad68ea1c139d487338661ff9887e81ecb85f3cd22ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -491,8 +648,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e5c7a3a25b8ddea664697319f45abdf9da62283b6b7c6025f51907b9885b06c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x60499749cbf2991a6733f2b82858ee1a24777963302dabdf884d8ee0e3fc53bd",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -571,10 +728,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecallcall_100_SuicideEnd_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/stCallCodes/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,19 +742,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x2c6236f77ed42df6c3590e3187d394cf359dd6de0ef5484086a30be62154d98c",
-                    "mixHash" : "0x316765b7395ae38d708346624f760edea37db41dcdc51ab9500de22bc831dddc",
-                    "nonce" : "0x1f9a010b66210fde",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0xf0badcd0286c01aaec6eb26b2f6f5c39b4eea08a6efb9eea60f9e98ceaa1f456",
+                    "mixHash" : "0xce1fd5cd2057082b4b91b1e0764e6cce9bb6c964f17aa3c3670a723b15cbd2c8",
+                    "nonce" : "0xb810bb330c1a8cd4",
                     "number" : "0x01",
                     "parentHash" : "0xa8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301d",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0x74b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105b",
+                    "receiptTrie" : "0x28ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748",
+                    "stateRoot" : "0x8ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074b2bd4d783450743c013da55a61b245c897f173ef0400df9baa564d4467105ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0316765b7395ae38d708346624f760edea37db41dcdc51ab9500de22bc831dddc881f9a010b66210fdef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a8a45f172eb2fbe9019bcfeb3ab7584ca56ff34a34e7d3653bf85d84dc6e301da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2fa8714092b135f91e2b6f66281c1df243e8760889aea5285dd3be14217aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a028ca9d62fbe7fcfc0f3aadc9a50c8afe6bdb637acac09deef582d2383c11d748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0ce1fd5cd2057082b4b91b1e0764e6cce9bb6c964f17aa3c3670a723b15cbd2c888b810bb330c1a8cd4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -634,16 +791,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe031270d049809c909fcbda8b9dc1bf80bee8e14504b02f6744ad3648269eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c6236f77ed42df6c3590e3187d394cf359dd6de0ef5484086a30be62154d98c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf0badcd0286c01aaec6eb26b2f6f5c39b4eea08a6efb9eea60f9e98ceaa1f456",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -669,14 +819,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0.json
index 994fa04ca..3e9115580 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_100_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcodecallcall_100_SuicideMiddle_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/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x81443c8f80df29aab4515a07f2ea36ecc506a8c96ce02b631cca54ab09fc0c4f",
-                    "mixHash" : "0xe7b9d33e52b764fc2eb77bb9f9632ede08f05b4dae278b97517cd0778b3aa44c",
-                    "nonce" : "0x4ef4179bf7160c84",
+                    "hash" : "0xb24ab245ca5aa0af9dbf7e5554f8949ca627ff821d26a24eea5967ec001be494",
+                    "mixHash" : "0xe9b62e046a4408b97d226b79276d43f5be87f4933a6eab97210e01fa1e34dc0d",
+                    "nonce" : "0x14d08c931ba9b7c6",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
-                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
-                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0e7b9d33e52b764fc2eb77bb9f9632ede08f05b4dae278b97517cd0778b3aa44c884ef4179bf7160c84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0e9b62e046a4408b97d226b79276d43f5be87f4933a6eab97210e01fa1e34dc0d8814d08c931ba9b7c6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81443c8f80df29aab4515a07f2ea36ecc506a8c96ce02b631cca54ab09fc0c4f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb24ab245ca5aa0af9dbf7e5554f8949ca627ff821d26a24eea5967ec001be494",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcodecallcall_100_SuicideMiddle_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/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x952389372fccf26d16054b4f3e2da449ab5235f635fb91a0b3b050190019d618",
-                    "mixHash" : "0x7775b88beff31b5840d7bd2ff84198ddf6d9cb7b6a8153fc77f7343c96947985",
-                    "nonce" : "0xa7cc7d0984bc6df5",
+                    "hash" : "0xcb00f3b44adef03859c91fbe65fa969b471318c8c18c77286d6434c74e002b9a",
+                    "mixHash" : "0x3b2f44a9a8b7dfb1262e54c01547cedf72f45c9ff253e51fde4c5de89f6cc63a",
+                    "nonce" : "0x528060de79d6e7c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03b2f44a9a8b7dfb1262e54c01547cedf72f45c9ff253e51fde4c5de89f6cc63a88528060de79d6e7c6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb00f3b44adef03859c91fbe65fa969b471318c8c18c77286d6434c74e002b9a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xcbc086f13c2b53cf63dde5e6ebb1d48236b7443d42a7233e53a67b2af1d069ce",
+                    "mixHash" : "0x1dc340859f95c926504d0bc0270f5a7b9cd58e5f26820866d0d612cf312adc2f",
+                    "nonce" : "0x3463ae2e8b74fc8b",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
                     "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a07775b88beff31b5840d7bd2ff84198ddf6d9cb7b6a8153fc77f7343c9694798588a7cc7d0984bc6df5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a01dc340859f95c926504d0bc0270f5a7b9cd58e5f26820866d0d612cf312adc2f883463ae2e8b74fc8bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x952389372fccf26d16054b4f3e2da449ab5235f635fb91a0b3b050190019d618",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcbc086f13c2b53cf63dde5e6ebb1d48236b7443d42a7233e53a67b2af1d069ce",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcodecallcall_100_SuicideMiddle_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/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xcbf08db028c571f67569cae4b11af2d1cc143a5e1945190693c46b2981f1ed81",
-                    "mixHash" : "0xa87fda7982476c9f7c3dc2f43776b7315dfaf282e68650aa5ac7a17dd086b0be",
-                    "nonce" : "0xb410203a5cedda5e",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x6dd5839a16d1bae97643a9c9a843e97c8eab44148fae40b0988e7670f6f71214",
+                    "mixHash" : "0x68ccb7ce33b0ccca62bc34181816a0e38b23b979da79986a2955b38880845a04",
+                    "nonce" : "0x826ce7e03d3e3588",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
-                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
-                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
+                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
+                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0a87fda7982476c9f7c3dc2f43776b7315dfaf282e68650aa5ac7a17dd086b0be88b410203a5cedda5ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a068ccb7ce33b0ccca62bc34181816a0e38b23b979da79986a2955b38880845a0488826ce7e03d3e3588f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbf08db028c571f67569cae4b11af2d1cc143a5e1945190693c46b2981f1ed81",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6dd5839a16d1bae97643a9c9a843e97c8eab44148fae40b0988e7670f6f71214",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcodecallcall_100_SuicideMiddle_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/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x552c6dc27f4ee56d86887be744dec21065caca29641df6f2c782d7cd3b87c8a0",
-                    "mixHash" : "0xd9a71eeb065dd13ef3baf60d6efd48cc1cff1f2a984d47a2995a429ac8b7a6e8",
-                    "nonce" : "0x4a8f435ae1a8b938",
+                    "hash" : "0x32605efeb81080699b8ee78dd622bc01788ff37f9f8ce1ad119b5df56eccf6a6",
+                    "mixHash" : "0x2aa0f5fe773df6868a71554be18e8351de195831e46b2e5bc02159f15ff65ab5",
+                    "nonce" : "0xa260778df1d54d88",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
                     "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0d9a71eeb065dd13ef3baf60d6efd48cc1cff1f2a984d47a2995a429ac8b7a6e8884a8f435ae1a8b938f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a02aa0f5fe773df6868a71554be18e8351de195831e46b2e5bc02159f15ff65ab588a260778df1d54d88f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x552c6dc27f4ee56d86887be744dec21065caca29641df6f2c782d7cd3b87c8a0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x32605efeb81080699b8ee78dd622bc01788ff37f9f8ce1ad119b5df56eccf6a6",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcodecallcall_100_SuicideMiddle_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/stCallCodes/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0xfa1a595d85be16b96788513d2e686b05e7ff560a3a72c845c226118660f04295",
-                    "mixHash" : "0x6c6116374f305ad52b574c3c9254af771ff4b7270ee95eebc941295ed9d4ad87",
-                    "nonce" : "0x2be659fab71416f2",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x15e56ebac45baea99ac6ed86e423f8f54ad4987d7a6ccb21e484a00fbdc307d2",
+                    "mixHash" : "0x536757bd9450396d2a765054e73277e948e744c63e63fa7dfdf774bd4803f0c4",
+                    "nonce" : "0xdaee66960fb06540",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
+                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
+                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a06c6116374f305ad52b574c3c9254af771ff4b7270ee95eebc941295ed9d4ad87882be659fab71416f2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0536757bd9450396d2a765054e73277e948e744c63e63fa7dfdf774bd4803f0c488daee66960fb06540f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa1a595d85be16b96788513d2e686b05e7ff560a3a72c845c226118660f04295",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x15e56ebac45baea99ac6ed86e423f8f54ad4987d7a6ccb21e484a00fbdc307d2",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_d0g0v0.json
index 9f42ddee4..1204dc1a1 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_100_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_100_d0g0v0_EIP150" : {
+    "callcodecallcall_100_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/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xa3993e22907e7512d1d0ba5b14fdac94be973e0c5f712dde643437aade090238",
-                    "mixHash" : "0x7975ef6a252365dbef6933cc9671c7daa0513d6dbcee70d8a53024a2c0d85863",
-                    "nonce" : "0x18ce2d744ebf4471",
+                    "hash" : "0x9ab2eec413fa5b49fd7e2a872a33a9afe3db0aa7e28c628580476eda0bf6b823",
+                    "mixHash" : "0x91dffbd7288619077710738c123bf78282637386d8c0eb176423a5003f63cb98",
+                    "nonce" : "0xe82eabf6beaf1f64",
                     "number" : "0x01",
                     "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "0x58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
-                    "stateRoot" : "0x240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xdde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07975ef6a252365dbef6933cc9671c7daa0513d6dbcee70d8a53024a2c0d858638818ce2d744ebf4471f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a091dffbd7288619077710738c123bf78282637386d8c0eb176423a5003f63cb9888e82eabf6beaf1f64f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3993e22907e7512d1d0ba5b14fdac94be973e0c5f712dde643437aade090238",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9ab2eec413fa5b49fd7e2a872a33a9afe3db0aa7e28c628580476eda0bf6b823",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcodecallcall_100_d0g0v0_EIP158" : {
+    "callcodecallcall_100_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/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x9620094ef32278f0d35b7e0a9ce4a6bc5fccf5e08e26c1cc0f6d764433ebbfe4",
-                    "mixHash" : "0x25088d9a4394c10b9653263f38a5ac6867b12e3d760de586f255d1f8f459ea59",
-                    "nonce" : "0x6b32a7c077b17fae",
+                    "hash" : "0xd74bc350690ca11fe8cdaf0bd76abdaaaee577a912c5e859c1f042f6e02a817c",
+                    "mixHash" : "0x1a8c5faa8395df065d48bc495d528fc74f253f672ddab1419ef56e7efbc570f6",
+                    "nonce" : "0x9ac55709ba61825d",
+                    "number" : "0x01",
+                    "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0xdde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a01a8c5faa8395df065d48bc495d528fc74f253f672ddab1419ef56e7efbc570f6889ac55709ba61825df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd74bc350690ca11fe8cdaf0bd76abdaaaee577a912c5e859c1f042f6e02a817c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763fffe",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x03",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x014a" : "0x1000000000000000000000000000000000000003",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000002",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xc9ebd54cfb1581acaa47a7f6bd9101d894ee425b03de1acecc4d92baba52629d",
+                    "mixHash" : "0x599df56d1b6b850102f7be5c63d91911c9e57da3b5082963d18261340855f80e",
+                    "nonce" : "0x1f58f856685cad64",
                     "number" : "0x01",
                     "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
                     "receiptTrie" : "0x58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a025088d9a4394c10b9653263f38a5ac6867b12e3d760de586f255d1f8f459ea59886b32a7c077b17faef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0599df56d1b6b850102f7be5c63d91911c9e57da3b5082963d18261340855f80e881f58f856685cad64f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9620094ef32278f0d35b7e0a9ce4a6bc5fccf5e08e26c1cc0f6d764433ebbfe4",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc9ebd54cfb1581acaa47a7f6bd9101d894ee425b03de1acecc4d92baba52629d",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcodecallcall_100_d0g0v0_Frontier" : {
+    "callcodecallcall_100_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/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0xa27b86e926f7e4f671f8135706655be86968ef8aaf2299e6550a6883fa6adf16",
-                    "mixHash" : "0x4f834931ab591c3943e6664f360085e0ccd3d56c81174e7938555ecee50d58f2",
-                    "nonce" : "0x4059a917f44793f9",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x1114c6b486658fc2c49285403097e56a0492f648418ae8f0249d4cfdac59b6b6",
+                    "mixHash" : "0x7a25519f39d5b059576c9b93d11ddb8734e8c7a07f81df9c6a049f19d02564b6",
+                    "nonce" : "0x172a0775ce0aeb91",
                     "number" : "0x01",
                     "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "0x9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
-                    "stateRoot" : "0x947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3a",
+                    "receiptTrie" : "0x58fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033a",
+                    "stateRoot" : "0x240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a04f834931ab591c3943e6664f360085e0ccd3d56c81174e7938555ecee50d58f2884059a917f44793f9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0240cc6180be6bf7ceafe681bb6d7ac19f238801c277c424f923b60ad4ff20f12a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a058fb6f06e749766a3d91e784d2eadbaeff743a5d73028a4c743122cc8885033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07a25519f39d5b059576c9b93d11ddb8734e8c7a07f81df9c6a049f19d02564b688172a0775ce0aeb91f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa27b86e926f7e4f671f8135706655be86968ef8aaf2299e6550a6883fa6adf16",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1114c6b486658fc2c49285403097e56a0492f648418ae8f0249d4cfdac59b6b6",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcodecallcall_100_d0g0v0_Homestead" : {
+    "callcodecallcall_100_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/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0x54f89b6ea34387b7d60e8d45f201091bb0aba18883d759bfdedbcfe9d981a53f",
-                    "mixHash" : "0x1de1a057fba205527cf74c7e6dc30743b79608a48f69653fd82fe71a3d8e97a7",
-                    "nonce" : "0x420bbd8c77735a7a",
+                    "hash" : "0xcbeacf750e7b7c1a88fd10fd62a913fa0f1e552fae3ad19544de47613b7204fc",
+                    "mixHash" : "0xdebd04e84adb76ce3ffcb23b553f939fe42e03d0a035f9c740aa5c52076da012",
+                    "nonce" : "0x4163f734a8f97215",
                     "number" : "0x01",
                     "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
                     "receiptTrie" : "0x9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a01de1a057fba205527cf74c7e6dc30743b79608a48f69653fd82fe71a3d8e97a788420bbd8c77735a7af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0debd04e84adb76ce3ffcb23b553f939fe42e03d0a035f9c740aa5c52076da012884163f734a8f97215f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54f89b6ea34387b7d60e8d45f201091bb0aba18883d759bfdedbcfe9d981a53f",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcbeacf750e7b7c1a88fd10fd62a913fa0f1e552fae3ad19544de47613b7204fc",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcodecallcall_100_d0g0v0_Metropolis" : {
+    "callcodecallcall_100_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/stCallCodes/callcodecallcall_100_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0xcf0553cd25752e3d29fbd3712517d043ea7673b0a86f429067d0e6c1f600cf48",
-                    "mixHash" : "0x34450aa4964f8f76fd72bc409a363ca879f4c7aec97081a3a0d9037a078fa4fa",
-                    "nonce" : "0x0f7bf9dc28919939",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0x273cf91f2864efffe1db18681966d1216f379336e188a4d7d2c51fdae8f4b46d",
+                    "mixHash" : "0x4441ded4798328633f6c65d263cc9d67993bf356333efdf31055caf885ddc548",
+                    "nonce" : "0xfdecef34fdea8ad2",
                     "number" : "0x01",
                     "parentHash" : "0xa2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0xdde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25e",
+                    "receiptTrie" : "0x9b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64f",
+                    "stateRoot" : "0x947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dde0a0f8698fd450c7d003282a496e36eb6c7f94a1e7bd7f64b76d982e7fa25ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a034450aa4964f8f76fd72bc409a363ca879f4c7aec97081a3a0d9037a078fa4fa880f7bf9dc28919939f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0a2d5546ba21838866abe2be935ea3de5b2bbcc908cb73f418b5c1a4abc3d8c24a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0947649b46af539723a82fe079d27cb5a5e1940668bf7753ec78ce2a81e231a3aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09b0b78cf128285b281bf2546b57d552e13045534c2664c64e239f2232a04e64fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a04441ded4798328633f6c65d263cc9d67993bf356333efdf31055caf885ddc54888fdecef34fdea8ad2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5e8c7770721c0e0e8a083e62cdb8b9a3be69f083e78525b70803fb25f5ff534a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf0553cd25752e3d29fbd3712517d043ea7673b0a86f429067d0e6c1f600cf48",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x273cf91f2864efffe1db18681966d1216f379336e188a4d7d2c51fdae8f4b46d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
index 4aac25e1c..9f63ac55e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcodecallcall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xe279152c2581a0df768ca3f0ceabb7880cc063112647bceb860a134bfd0a6070",
-                    "mixHash" : "0x17265ddb963b526b87d9504551f6d69a1307cde0a78f51301e0100af64deb70a",
-                    "nonce" : "0xdfa1a3f67ec07b72",
+                    "hash" : "0x90b7ff03b371e9c5052f7c19ce2881e6d9d09dd89f9b145aa087261db6fa7689",
+                    "mixHash" : "0xc03e7c73961abc821841683dac8067fe6bb8b377f65e4f195b51e559874576f4",
+                    "nonce" : "0x0e8f73029d178765",
                     "number" : "0x01",
                     "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "0x79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
-                    "stateRoot" : "0xb07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x5370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a017265ddb963b526b87d9504551f6d69a1307cde0a78f51301e0100af64deb70a88dfa1a3f67ec07b72f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0c03e7c73961abc821841683dac8067fe6bb8b377f65e4f195b51e559874576f4880e8f73029d178765f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe279152c2581a0df768ca3f0ceabb7880cc063112647bceb860a134bfd0a6070",
-        "network" : "EIP150",
+        "lastblockhash" : "0x90b7ff03b371e9c5052f7c19ce2881e6d9d09dd89f9b145aa087261db6fa7689",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcodecallcall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcodecallcall_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0xd814f157176f9ee1eaa60c507d477031f84ea7011f08eb181fd92363cfb3b73a",
+                    "mixHash" : "0xb0390afafce572f10514326ed4a128689d0c9ae4b2db5694aba67b26a23d083d",
+                    "nonce" : "0xe09dad2efb6b9678",
+                    "number" : "0x01",
+                    "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0x5370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0b0390afafce572f10514326ed4a128689d0c9ae4b2db5694aba67b26a23d083d88e09dad2efb6b9678f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd814f157176f9ee1eaa60c507d477031f84ea7011f08eb181fd92363cfb3b73a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xc7a2acd0aa13984a35939adc2948909b2c80e4de9c6196cdbf8631415c5cf8f1",
-                    "mixHash" : "0x2d736f7e6f1dc6cd6b459e97d77301bad9d69dd5fc3d0f7e148828bd1408a8a2",
-                    "nonce" : "0x97ac4b22b16f7d30",
+                    "hash" : "0x72cb4a883c6475a32679a6dfefc08b7367e58bc2a2da5e00c3d41401b3888079",
+                    "mixHash" : "0xef5339ef4d6a9f98146317ee4981753766a95fb9c5aeb1f29c7831380f1dac46",
+                    "nonce" : "0xeeeeeaae6a240214",
                     "number" : "0x01",
                     "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
                     "receiptTrie" : "0x79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a02d736f7e6f1dc6cd6b459e97d77301bad9d69dd5fc3d0f7e148828bd1408a8a28897ac4b22b16f7d30f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ef5339ef4d6a9f98146317ee4981753766a95fb9c5aeb1f29c7831380f1dac4688eeeeeaae6a240214f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7a2acd0aa13984a35939adc2948909b2c80e4de9c6196cdbf8631415c5cf8f1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x72cb4a883c6475a32679a6dfefc08b7367e58bc2a2da5e00c3d41401b3888079",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcodecallcall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcodecallcall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0xf345bcbd7b4eefdcaf8b03174cd30ac81081c4a1867550ec8cf9d842e64ff746",
-                    "mixHash" : "0x2cec2333697a20219fbebc4c21fcc05d954c72d48c8c7c2f54fbb5ed200c248a",
-                    "nonce" : "0xeb2486149740ae5b",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x0895f100ee7f7912df3aa50fc9e029d119227fab3f2aca4ba1d952d581b4f56a",
+                    "mixHash" : "0x9ed7e750e6e8cbad4a314d3f82bb02441891d133f873c6e6d14e809245150a63",
+                    "nonce" : "0xc102f6cb84e8d921",
                     "number" : "0x01",
                     "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "0xff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
-                    "stateRoot" : "0x69efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7",
+                    "receiptTrie" : "0x79aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92b",
+                    "stateRoot" : "0xb07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a02cec2333697a20219fbebc4c21fcc05d954c72d48c8c7c2f54fbb5ed200c248a88eb2486149740ae5bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07c592b0af13c6db054fb7bb386215ab8f3dbf8192bc69cd84a8c9d5124c825a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a079aa5d6bd6549f2350cb298e0f3d647c3d3daedba62a917aff381abbfbe0c92bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a09ed7e750e6e8cbad4a314d3f82bb02441891d133f873c6e6d14e809245150a6388c102f6cb84e8d921f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf345bcbd7b4eefdcaf8b03174cd30ac81081c4a1867550ec8cf9d842e64ff746",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0895f100ee7f7912df3aa50fc9e029d119227fab3f2aca4ba1d952d581b4f56a",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcodecallcall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcodecallcall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0xedd3ecbea2ab689c2d0f3cce3ca084d3820d1981a30420ac402c69ac8f258a70",
-                    "mixHash" : "0x2293cfe4587273249cee4bf487e8ed786c63ab0a406efbe21c3749e766f213fa",
-                    "nonce" : "0xb6258e1778764ad0",
+                    "hash" : "0x2884986a79814ffdd2fa0e3b65c7e4dc71c8f8d2318c2df0dad3c5eb23d15a82",
+                    "mixHash" : "0xf3de23487634623cd23ed12f46455d885a46782c879cb772762fe14d61ecf681",
+                    "nonce" : "0x7964edd4ce05663e",
                     "number" : "0x01",
                     "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
                     "receiptTrie" : "0xff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a02293cfe4587273249cee4bf487e8ed786c63ab0a406efbe21c3749e766f213fa88b6258e1778764ad0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0f3de23487634623cd23ed12f46455d885a46782c879cb772762fe14d61ecf681887964edd4ce05663ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedd3ecbea2ab689c2d0f3cce3ca084d3820d1981a30420ac402c69ac8f258a70",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2884986a79814ffdd2fa0e3b65c7e4dc71c8f8d2318c2df0dad3c5eb23d15a82",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcodecallcall_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcodecallcall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0x15ca6dca7a6854f710a21155e3b0dd91520d2c9741711c6098eff59a45649cfe",
-                    "mixHash" : "0x6f32a165768879e1e26aaf8a42b5f374d17704201982cd889b9ecb377d247956",
-                    "nonce" : "0x074fec6083234540",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0x7fde38539ddfac86271d13515fb77be6b024f9c2146b3b6536bb68de997f6d71",
+                    "mixHash" : "0x0ef1f1514b40611e8da4d0e9370dd141584772e9aba465ca3e484eb49226ecda",
+                    "nonce" : "0x848300c0c077dade",
                     "number" : "0x01",
                     "parentHash" : "0x425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57f",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0x5370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57",
+                    "receiptTrie" : "0xff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681",
+                    "stateRoot" : "0x69efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05370f3e138c4959982cdd6494f49321543c80a7fd329d556dfcdafb03c4fea57a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06f32a165768879e1e26aaf8a42b5f374d17704201982cd889b9ecb377d24795688074fec6083234540f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0425a0998f78e83a1f185c090374293a8a43f5037a6b3e928f86f04853f2bf57fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069efdf2565cd544df48ebd72a562b8714cb81b4e61e48dc225d8e3ae4c7d27a7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ff480b05b322d5c4b6a6c53dbc2afc2308a613d04176749a060e799d2b52e681b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a00ef1f1514b40611e8da4d0e9370dd141584772e9aba465ca3e484eb49226ecda88848300c0c077dadef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c14f55afe86959ef085c8c80be33857eff39cbe9c0c954891f10d2526db61b6ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15ca6dca7a6854f710a21155e3b0dd91520d2c9741711c6098eff59a45649cfe",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7fde38539ddfac86271d13515fb77be6b024f9c2146b3b6536bb68de997f6d71",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0.json
index 592917e5d..e9cecb535 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_101_OOGE_d0g0v0_EIP150" : {
+    "callcodecallcallcode_101_OOGE_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/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0xb892b92e168f2922a10c712115baa511b5b7c15b786e950a1d9b30c6e9b82cb3",
-                    "mixHash" : "0x568e97ae20b6e920db93b7feba945c7d43adb9285c19677aa7dbd33d956303cc",
-                    "nonce" : "0xe95e392a42397650",
+                    "hash" : "0x26b9b48693fe4ce735543307dacbe5e1bb40f5039e7ef510c41a0acec31a723b",
+                    "mixHash" : "0x78e7e96e4f099368463d89b6957620d6f51c10d1bd550e9daf2c5366b56e0a83",
+                    "nonce" : "0x0698430f618c2f24",
                     "number" : "0x01",
                     "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "0x0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
-                    "stateRoot" : "0xabeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xc8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0568e97ae20b6e920db93b7feba945c7d43adb9285c19677aa7dbd33d956303cc88e95e392a42397650f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afcaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a078e7e96e4f099368463d89b6957620d6f51c10d1bd550e9daf2c5366b56e0a83880698430f618c2f24f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb892b92e168f2922a10c712115baa511b5b7c15b786e950a1d9b30c6e9b82cb3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x26b9b48693fe4ce735543307dacbe5e1bb40f5039e7ef510c41a0acec31a723b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGE_d0g0v0_EIP158" : {
+    "callcodecallcallcode_101_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x1de35ecedd394e27c04daecc87e7f9ac3079224da7677651cba2826d04b0d832",
+                    "mixHash" : "0x484c76861e64ec55edb83bb7038d765213b258515a3fdbf89c470d082b9d5334",
+                    "nonce" : "0x2611cf4ae5852a30",
+                    "number" : "0x01",
+                    "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xc8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afcaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0484c76861e64ec55edb83bb7038d765213b258515a3fdbf89c470d082b9d5334882611cf4ae5852a30f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1de35ecedd394e27c04daecc87e7f9ac3079224da7677651cba2826d04b0d832",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_OOGE_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/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x907d853be15d93ee29bcc955bad9b86c726f051d024ce3728a0abc20b3afdad6",
-                    "mixHash" : "0x6135ea407f04d24b25d1a814fe98a0b5b6a53361e835d1439978156c9d653d91",
-                    "nonce" : "0x5c6ff67be3d780a1",
+                    "hash" : "0xb259829d201889c87ee52865557fa8a8e2ff6e2ed80d2f60c05351d1782ade9a",
+                    "mixHash" : "0xd655d9c09817611626278433979b5d99685fd9f8473babcbcdcfb3a137feab39",
+                    "nonce" : "0xa3c36a939c33151e",
                     "number" : "0x01",
                     "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
                     "receiptTrie" : "0x0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a06135ea407f04d24b25d1a814fe98a0b5b6a53361e835d1439978156c9d653d91885c6ff67be3d780a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0d655d9c09817611626278433979b5d99685fd9f8473babcbcdcfb3a137feab3988a3c36a939c33151ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x907d853be15d93ee29bcc955bad9b86c726f051d024ce3728a0abc20b3afdad6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb259829d201889c87ee52865557fa8a8e2ff6e2ed80d2f60c05351d1782ade9a",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGE_d0g0v0_Frontier" : {
+    "callcodecallcallcode_101_OOGE_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/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0x3ce42be078aaf04b833fb4ba8d96e646ec76b7af3ae15bc53b151e0db67e6fbf",
-                    "mixHash" : "0x73d54e81a5556d2d688d80e2cb137283c479206ecb77d599a771814ce600366c",
-                    "nonce" : "0x045fa85b2a7aac9c",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x902d01aa69af0fdf2f232669fb1de71931ef92aba5b992615aee1de3d9cef65b",
+                    "mixHash" : "0x2e41e354d37c575f23b8889f1c39f9a0bf0f7004efdbdf23063ca529ebca0deb",
+                    "nonce" : "0x3948fe6a98d545da",
                     "number" : "0x01",
                     "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "0xd7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
-                    "stateRoot" : "0x7ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64",
+                    "receiptTrie" : "0x0f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83",
+                    "stateRoot" : "0xabeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a073d54e81a5556d2d688d80e2cb137283c479206ecb77d599a771814ce600366c88045fa85b2a7aac9cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abeb2b72b7c78ae544fd4c56f1bc5c5d6898106ecaca49f521ec85ec2e233b63a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00f82446fc4e7ba087c710827de22f10e7951134f9f2c6d1ecd36b8201ed42c83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a02e41e354d37c575f23b8889f1c39f9a0bf0f7004efdbdf23063ca529ebca0deb883948fe6a98d545daf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ce42be078aaf04b833fb4ba8d96e646ec76b7af3ae15bc53b151e0db67e6fbf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x902d01aa69af0fdf2f232669fb1de71931ef92aba5b992615aee1de3d9cef65b",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGE_d0g0v0_Homestead" : {
+    "callcodecallcallcode_101_OOGE_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/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0xd516a4173473759ea7a8075b2ed0cdabe0e419394ff8ec1a4b7ce4fb558649c1",
-                    "mixHash" : "0xc172d5e45957331460ee2fc228460dd6b9811bfe519a08d1836d657384157248",
-                    "nonce" : "0xbe14ea1c05689656",
+                    "hash" : "0xc2578d916bc1fefeb7289d22d10f43172ec65d249aef4d73968d906afbbe5de7",
+                    "mixHash" : "0x6af9dd9cdb737cddf4ad303b877ab56b38de05f0d6d54a375ed89c6b2474205d",
+                    "nonce" : "0x2584a4e7fdc906b4",
                     "number" : "0x01",
                     "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
                     "receiptTrie" : "0xd7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0c172d5e45957331460ee2fc228460dd6b9811bfe519a08d1836d65738415724888be14ea1c05689656f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a06af9dd9cdb737cddf4ad303b877ab56b38de05f0d6d54a375ed89c6b2474205d882584a4e7fdc906b4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd516a4173473759ea7a8075b2ed0cdabe0e419394ff8ec1a4b7ce4fb558649c1",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc2578d916bc1fefeb7289d22d10f43172ec65d249aef4d73968d906afbbe5de7",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGE_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_101_OOGE_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/stCallCodes/callcodecallcallcode_101_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0x886288466922077c8716fc80f8643c3579f219f7746326ac54e45e2546387f40",
-                    "mixHash" : "0x3d357668ca53ebfc1d5e97ce30b8ab522576122b79d8adb9e199776031995c7c",
-                    "nonce" : "0xb952b9144b316a9f",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0xc10881e0c693d8ec99df8c2581153eb53325e3dcfb39549b31cdbeb98174b0d8",
+                    "mixHash" : "0x176194513f7ff75651e7355ef5900846c77643fe83ac59c860451c14fbc75bb9",
+                    "nonce" : "0xf1e8d7ac28eef80b",
                     "number" : "0x01",
                     "parentHash" : "0x78b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0xc8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afca",
+                    "receiptTrie" : "0xd7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5de",
+                    "stateRoot" : "0x7ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8233850f17d1fc7e5ecbaa522745f7cc15606bb590527949bafdb5b7396afcaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a03d357668ca53ebfc1d5e97ce30b8ab522576122b79d8adb9e199776031995c7c88b952b9144b316a9ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a078b67f8330b090299f82e5108fb157ddff223fa4d3235862250ca29eea1f79e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ad3b55241b119672ea9bce47ed6cf2224a5fcabc86b21dba9c516652760ef64a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d7090fb88ad2318242df5308820eaecf0f2071ebc97213ed8606cface86ab5deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0176194513f7ff75651e7355ef5900846c77643fe83ac59c860451c14fbc75bb988f1e8d7ac28eef80bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d352493cfe8f1718e845d4d460782e7a07e48cbec0cb5fd136a610f8b71ee2d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x886288466922077c8716fc80f8643c3579f219f7746326ac54e45e2546387f40",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc10881e0c693d8ec99df8c2581153eb53325e3dcfb39549b31cdbeb98174b0d8",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
index 515103397..b8ff82775 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_101_OOGMAfter_d0g0v0_EIP150" : {
+    "callcodecallcallcode_101_OOGMAfter_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/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x59ad3e552450fbf2608fc84cedda88a4fa2fa089396da36a25a4b4143aec464c",
-                    "mixHash" : "0x20f853960eeb3724c8b0e9330f01b2e42143ffbf9a75c5c1d601a17610873ff3",
-                    "nonce" : "0x7ad5d7680475ad99",
+                    "hash" : "0x9a1ce5e3ccbd6b1c53e56300694274e7da0bf3cd36537274ed7e025def50e801",
+                    "mixHash" : "0x62744077743c5de277fad15656538e1dac5d9b69192a69b0b646bddb410c129e",
+                    "nonce" : "0x5969a71aaa5cc0d2",
                     "number" : "0x01",
                     "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
-                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x74862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a020f853960eeb3724c8b0e9330f01b2e42143ffbf9a75c5c1d601a17610873ff3887ad5d7680475ad99f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a062744077743c5de277fad15656538e1dac5d9b69192a69b0b646bddb410c129e885969a71aaa5cc0d2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59ad3e552450fbf2608fc84cedda88a4fa2fa089396da36a25a4b4143aec464c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9a1ce5e3ccbd6b1c53e56300694274e7da0bf3cd36537274ed7e025def50e801",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_d0g0v0_EIP158" : {
+    "callcodecallcallcode_101_OOGMAfter_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/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x94874aed7aaec253396621df89e58d972548132678602347ff401598dfce6d01",
-                    "mixHash" : "0x8d493af8aad8422f5dd857de33edf5107758bc2f994bd05813bbf4c07f7a3b2d",
-                    "nonce" : "0xd9c713f7ef6b1075",
+                    "hash" : "0xb948104693eb263d1614a2d1c954048cc6f88733b831b34d3a1013a352f6f590",
+                    "mixHash" : "0x515ea128de20bd1d9672563955ec3a9c73d14ceae20913d3417f15c5058d3968",
+                    "nonce" : "0x3d7e3a5207a1f8c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x74862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0515ea128de20bd1d9672563955ec3a9c73d14ceae20913d3417f15c5058d3968883d7e3a5207a1f8c6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb948104693eb263d1614a2d1c954048cc6f88733b831b34d3a1013a352f6f590",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x9e284511d3efb47032f7e234f591b5b2356b3fbe8f9395bbaa57cfd16f381af4",
+                    "mixHash" : "0xdde43d9e78125fd21a8545e7cb3c4382b2ce8692eba4c942df85f4b8988d6e5d",
+                    "nonce" : "0x1192ebb74e57cadc",
                     "number" : "0x01",
                     "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
                     "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a08d493af8aad8422f5dd857de33edf5107758bc2f994bd05813bbf4c07f7a3b2d88d9c713f7ef6b1075f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0dde43d9e78125fd21a8545e7cb3c4382b2ce8692eba4c942df85f4b8988d6e5d881192ebb74e57cadcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94874aed7aaec253396621df89e58d972548132678602347ff401598dfce6d01",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9e284511d3efb47032f7e234f591b5b2356b3fbe8f9395bbaa57cfd16f381af4",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_d0g0v0_Frontier" : {
+    "callcodecallcallcode_101_OOGMAfter_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/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xf22ee9b2b96ab3bb30dd49108b3827547a268a73116ac9730ede0313dd58f12d",
-                    "mixHash" : "0xaf75228a73dcbe6ae5902ddbb4973a45746d19b71f253b90c017f0f3d0a5ccbb",
-                    "nonce" : "0xadce344b3caf03db",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x5e6a99c3a5d8c35d7cd6d8d2e1a7375a00a72bd5b8611e35d20149ef835759f7",
+                    "mixHash" : "0x0024e0c1b47921e71c807575d1196eb1dc7d51a499b4c3a56f0d118654122e0a",
+                    "nonce" : "0xdf98a9c6376a67f1",
                     "number" : "0x01",
                     "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
-                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
+                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
+                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0af75228a73dcbe6ae5902ddbb4973a45746d19b71f253b90c017f0f3d0a5ccbb88adce344b3caf03dbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a00024e0c1b47921e71c807575d1196eb1dc7d51a499b4c3a56f0d118654122e0a88df98a9c6376a67f1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf22ee9b2b96ab3bb30dd49108b3827547a268a73116ac9730ede0313dd58f12d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5e6a99c3a5d8c35d7cd6d8d2e1a7375a00a72bd5b8611e35d20149ef835759f7",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_d0g0v0_Homestead" : {
+    "callcodecallcallcode_101_OOGMAfter_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/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xebc9bee02af2509bdb703115b5471dad61394f77ba7e85f2adc4b095460a5f71",
-                    "mixHash" : "0x9c7587ad869da53c9827f9d3ebcf646bd45e586a0e8fecb71e8e08f0db0c26c3",
-                    "nonce" : "0x1a41a31b18b27f99",
+                    "hash" : "0x1ee1bd83e6746daa00a545ad1d2ce335583a8513bc96f6c13e8ac9cadb09d2c4",
+                    "mixHash" : "0xb6213b43acf5e52f84947d3ae98ee094677bbc2c06bbcd47feaa28ad2faa58a6",
+                    "nonce" : "0xc4812a9b39131f6e",
                     "number" : "0x01",
                     "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
                     "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a09c7587ad869da53c9827f9d3ebcf646bd45e586a0e8fecb71e8e08f0db0c26c3881a41a31b18b27f99f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b6213b43acf5e52f84947d3ae98ee094677bbc2c06bbcd47feaa28ad2faa58a688c4812a9b39131f6ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xebc9bee02af2509bdb703115b5471dad61394f77ba7e85f2adc4b095460a5f71",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1ee1bd83e6746daa00a545ad1d2ce335583a8513bc96f6c13e8ac9cadb09d2c4",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_101_OOGMAfter_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/stCallCodes/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xc506ef3360e8d6f737213c9340cc190310ec0ed8a2610c0d46b2103d02f80c16",
-                    "mixHash" : "0xfda0ea4fd8c3176c324a479e4d9ee513007f2c899690cb1490dde8b689a5ff8d",
-                    "nonce" : "0x3fb1cd6d311edd3a",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x34b9e6c6de3a8a152067b2c51283ee1ccc74e2307c5e3a693aa266e5ee703080",
+                    "mixHash" : "0x03240a4e571c72bec6492bda0de5d944e6d6b711f24f8c063398b773e32a3022",
+                    "nonce" : "0xc5c82d576de42fa4",
                     "number" : "0x01",
                     "parentHash" : "0x47bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0x74862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9",
+                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
+                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0fda0ea4fd8c3176c324a479e4d9ee513007f2c899690cb1490dde8b689a5ff8d883fb1cd6d311edd3af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a047bc1ab29cc8903ea97694059f3d1e9c0780db0d268da39753cf5b7091328207a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a003240a4e571c72bec6492bda0de5d944e6d6b711f24f8c063398b773e32a302288c5c82d576de42fa4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc506ef3360e8d6f737213c9340cc190310ec0ed8a2610c0d46b2103d02f80c16",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x34b9e6c6de3a8a152067b2c51283ee1ccc74e2307c5e3a693aa266e5ee703080",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
index 8853959e2..2b50d750b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_101_OOGMBefore_d0g0v0_EIP150" : {
+    "callcodecallcallcode_101_OOGMBefore_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/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x21067d7aac8f1e91024dc8e717bce3943aa521c5fbadc9cb4dc9c3b4cf92108b",
-                    "mixHash" : "0xa6656b963b63cfdc36161f229c5258014e1a5fc1c8fa904b7f199f8ec5d707b8",
-                    "nonce" : "0x6a94c5e2774040a2",
+                    "hash" : "0x3b77715baa8ed9ab4fee8f4be56896d7e1cefb675f11664acadceede7fc5dfb7",
+                    "mixHash" : "0x5c41698aa5df532fc797765f8695f25d6692668f21d30c202547f7fc93d1967a",
+                    "nonce" : "0x8cd9053e1b8e8aca",
                     "number" : "0x01",
                     "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "0xcc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
-                    "stateRoot" : "0x6d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0a6656b963b63cfdc36161f229c5258014e1a5fc1c8fa904b7f199f8ec5d707b8886a94c5e2774040a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a05c41698aa5df532fc797765f8695f25d6692668f21d30c202547f7fc93d1967a888cd9053e1b8e8acaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21067d7aac8f1e91024dc8e717bce3943aa521c5fbadc9cb4dc9c3b4cf92108b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3b77715baa8ed9ab4fee8f4be56896d7e1cefb675f11664acadceede7fc5dfb7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMBefore_d0g0v0_EIP158" : {
+    "callcodecallcallcode_101_OOGMBefore_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/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xc221af8db6d25a68a9d6ec90b263dca276b72a533e7ce3c276484cf3a5ed2244",
-                    "mixHash" : "0x689e01ba1fe2b23a0e287ca7bebcb13a2c772acfbc5c4d0dad486a02c31b6e54",
-                    "nonce" : "0x45296133e6be931d",
+                    "hash" : "0x0f624725dc3704f863b9933e5b4cfd25d41b6e4f77473b816be426e6ca744b9b",
+                    "mixHash" : "0x73e429ee4bb7b098bc28ba709c35d5269d3bef84a3c9daf15531d29d203f8aee",
+                    "nonce" : "0xddbfbbd69026d01c",
+                    "number" : "0x01",
+                    "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a073e429ee4bb7b098bc28ba709c35d5269d3bef84a3c9daf15531d29d203f8aee88ddbfbbd69026d01cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0ac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0f624725dc3704f863b9933e5b4cfd25d41b6e4f77473b816be426e6ca744b9b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x3abeb4f4bc2e08acdf524a28c2a08d70df9b33f76489a382b614f974d8d98669",
+                    "mixHash" : "0xdcaaa9177b3a7a16219501a3a7198e078ae6584f2420348467d83f9d51970a1d",
+                    "nonce" : "0x5415cb729839f2a5",
                     "number" : "0x01",
                     "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
                     "receiptTrie" : "0xcc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0689e01ba1fe2b23a0e287ca7bebcb13a2c772acfbc5c4d0dad486a02c31b6e548845296133e6be931df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0dcaaa9177b3a7a16219501a3a7198e078ae6584f2420348467d83f9d51970a1d885415cb729839f2a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc221af8db6d25a68a9d6ec90b263dca276b72a533e7ce3c276484cf3a5ed2244",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3abeb4f4bc2e08acdf524a28c2a08d70df9b33f76489a382b614f974d8d98669",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMBefore_d0g0v0_Frontier" : {
+    "callcodecallcallcode_101_OOGMBefore_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/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x007fd3f5630d5e6e26d9c2dac04f94c7de0b76c648396ca97075ad574cb3ea18",
-                    "mixHash" : "0x1019e63483330adf46fca2b48eb3211f4ad688dbb493931fbce3c1209f7afaff",
-                    "nonce" : "0x2bdfe765be933bcb",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0x70d7c52f3f46457227ef2d75b6f0241959ae15322a6dba53e99222a7e020ed47",
+                    "mixHash" : "0x80c7d7889e9b447b4374f820f279f4b20957d916bc8f8e4f3f0c993430bf1864",
+                    "nonce" : "0x2b8d4307d69953f7",
                     "number" : "0x01",
                     "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "0xc55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
-                    "stateRoot" : "0x633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7",
+                    "receiptTrie" : "0xcc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9eb",
+                    "stateRoot" : "0x6d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a01019e63483330adf46fca2b48eb3211f4ad688dbb493931fbce3c1209f7afaff882bdfe765be933bcbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d2f690c1d1f9a3b02a917c773910eb029cfe841bacf41be4594215359aad788a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0cc5d5fe99416cb30b1c6765e13b7ba545a4777a93e3b60c6529bdca0de21f9ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a080c7d7889e9b447b4374f820f279f4b20957d916bc8f8e4f3f0c993430bf1864882b8d4307d69953f7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x007fd3f5630d5e6e26d9c2dac04f94c7de0b76c648396ca97075ad574cb3ea18",
-        "network" : "Frontier",
+        "lastblockhash" : "0x70d7c52f3f46457227ef2d75b6f0241959ae15322a6dba53e99222a7e020ed47",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMBefore_d0g0v0_Homestead" : {
+    "callcodecallcallcode_101_OOGMBefore_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/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xd82b5908008f24fbb4c5ee73fb8881849dcd95acd3382c3f8c1007fc22050544",
-                    "mixHash" : "0x350461a1c75479a5a1684c9e75b0b71fd229204b687a27cffe0746a7ca9dd2f0",
-                    "nonce" : "0x08fbbe07ef5cecc8",
+                    "hash" : "0x2d211e505a1c7971aad4d395267e72a37370559911095657cf09ee2a11a666e9",
+                    "mixHash" : "0x2c791193dca4b015212ef759aa2ea6004f3f489c719dec13f51b5443bf589be5",
+                    "nonce" : "0x96eff231888b9d2f",
                     "number" : "0x01",
                     "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
                     "receiptTrie" : "0xc55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0350461a1c75479a5a1684c9e75b0b71fd229204b687a27cffe0746a7ca9dd2f08808fbbe07ef5cecc8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a02c791193dca4b015212ef759aa2ea6004f3f489c719dec13f51b5443bf589be58896eff231888b9d2ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd82b5908008f24fbb4c5ee73fb8881849dcd95acd3382c3f8c1007fc22050544",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2d211e505a1c7971aad4d395267e72a37370559911095657cf09ee2a11a666e9",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_101_OOGMBefore_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/stCallCodes/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0x0b0a15f29a72e3008c78ed79d2201ba562d8138a2d99d5c82d6dce068b248cb7",
-                    "mixHash" : "0xc1e807b4663c2bb13300e09c88b9a7a6d51239e9f0ec89997ab58d7d8e2c80be",
-                    "nonce" : "0x2a5a9b81cc5d98b4",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xb0fd4c853a47e69ba1c7af4d91c123b28d9c83447bd11c17a013e69d9ffb02aa",
+                    "mixHash" : "0xf3c5c8b6c9991fad6616ba7cd633ecfbf4847bc99c59e2c4f56be87fc22bebb5",
+                    "nonce" : "0xda5ee51893e31a32",
                     "number" : "0x01",
                     "parentHash" : "0xe5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649c",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0xec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188",
+                    "receiptTrie" : "0xc55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0b",
+                    "stateRoot" : "0x633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec7d867f19228f698794346397d3648ed3039914246602c3ca8cc2c0ea617188a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0c1e807b4663c2bb13300e09c88b9a7a6d51239e9f0ec89997ab58d7d8e2c80be882a5a9b81cc5d98b4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e5efae34713cdf71d88df66af2a97435e56cee276919894ff5eaa36daf64649ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0633481416a7ac8155a08c77976860d87a7e3ed1647770238983456f73ab2e3c7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c55d8843f05854c66f180b38144d7a85a89b40abb263a70c35757f94c4f89c0bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0f3c5c8b6c9991fad6616ba7cd633ecfbf4847bc99c59e2c4f56be87fc22bebb588da5ee51893e31a32f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1492545adf3dd13efe96411f1151aaa989f62e900e5ab3d55265998dff8c0aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b0a15f29a72e3008c78ed79d2201ba562d8138a2d99d5c82d6dce068b248cb7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb0fd4c853a47e69ba1c7af4d91c123b28d9c83447bd11c17a013e69d9ffb02aa",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
index 3786e69f1..124b2c895 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_101_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecallcallcode_101_SuicideEnd_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/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x9dbd137d952f0930422346a8bca39369a5d37d4cabaab2450cce9895c5dd3bb7",
-                    "mixHash" : "0x1b2e661062c78acf0ba57638f272b7bbc63380397cff36e7ce9bf452a92f5205",
-                    "nonce" : "0x49d141719e4269f8",
+                    "hash" : "0x51a39cbdc6be7bdf4e95502b9c80f870c80a77bd48cd93149398f2e17e6b5271",
+                    "mixHash" : "0xdd405e1dca17df6eb5b99a7a445e68bf58ea3f1aad3cfd4a2327cfd166a20edd",
+                    "nonce" : "0x71ba265e8e52850d",
                     "number" : "0x01",
                     "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "0x2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
-                    "stateRoot" : "0x541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x7b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a01b2e661062c78acf0ba57638f272b7bbc63380397cff36e7ce9bf452a92f52058849d141719e4269f8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0dd405e1dca17df6eb5b99a7a445e68bf58ea3f1aad3cfd4a2327cfd166a20edd8871ba265e8e52850df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dbd137d952f0930422346a8bca39369a5d37d4cabaab2450cce9895c5dd3bb7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x51a39cbdc6be7bdf4e95502b9c80f870c80a77bd48cd93149398f2e17e6b5271",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecallcallcode_101_SuicideEnd_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/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x97380af6958be83e8ff2b36a0264f6d0fa345c9adafe5248b4ee419414332aba",
-                    "mixHash" : "0xf3bce288d50b541ee295bfebc7964dc1fac7d062aa29d73dcb003c04651ebee5",
-                    "nonce" : "0x342117b648505029",
+                    "hash" : "0x96ef428c4c4b57721527fe45201170230b34b36858f76ca451644c5b816ab34a",
+                    "mixHash" : "0xe276d634873e892ba0cd2aa9dda981a35264b262ecb8208d9af0eedeaf2bcb08",
+                    "nonce" : "0x6411f0b216c4e141",
+                    "number" : "0x01",
+                    "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0x7b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0e276d634873e892ba0cd2aa9dda981a35264b262ecb8208d9af0eedeaf2bcb08886411f0b216c4e141f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x64458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x96ef428c4c4b57721527fe45201170230b34b36858f76ca451644c5b816ab34a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x04a817c800",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x517075839aa169e5f7b0353fbe3d9728273e92dce4fcd0f4589329c9479ce255",
+                    "mixHash" : "0x619f089846c89f5f4a659004411a4e6267b3f3b5a5afc0bcd95973bf8a0226dd",
+                    "nonce" : "0xc00494d1a0a337f0",
                     "number" : "0x01",
                     "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
                     "receiptTrie" : "0x2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0f3bce288d50b541ee295bfebc7964dc1fac7d062aa29d73dcb003c04651ebee588342117b648505029f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0619f089846c89f5f4a659004411a4e6267b3f3b5a5afc0bcd95973bf8a0226dd88c00494d1a0a337f0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97380af6958be83e8ff2b36a0264f6d0fa345c9adafe5248b4ee419414332aba",
-        "network" : "EIP158",
+        "lastblockhash" : "0x517075839aa169e5f7b0353fbe3d9728273e92dce4fcd0f4589329c9479ce255",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecallcallcode_101_SuicideEnd_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/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0x2c4b01a932f60491b3c3d0f8a564b3ac9f0355ea90e310be61f8e0f70ee04e82",
-                    "mixHash" : "0xd4f89d0503694a43880d2901f40a307c1351a132423924de380e0f0c6ff86346",
-                    "nonce" : "0xa902f3e111eea2aa",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x3cabe5e4829e8d58130210b659f0eeadc7350ad799f27abc2a800f399ba46f31",
+                    "mixHash" : "0x4391ade1708a8320545c5b90769baa4df1d83885549a394342ae53c691db4410",
+                    "nonce" : "0x6c3520bf69f82baf",
                     "number" : "0x01",
                     "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "0xf0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
-                    "stateRoot" : "0x73b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7f",
+                    "receiptTrie" : "0x2ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1",
+                    "stateRoot" : "0x541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d4f89d0503694a43880d2901f40a307c1351a132423924de380e0f0c6ff8634688a902f3e111eea2aaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541ccb3beac32c040b674f40511ebae6e213483c8c9a6609d74ea747c59ccbf7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ccf0d7452bbaf8b10fd09f81805bf33be7a0e4bf5914fe4f1b6b01df48155f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a04391ade1708a8320545c5b90769baa4df1d83885549a394342ae53c691db4410886c3520bf69f82baff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c4b01a932f60491b3c3d0f8a564b3ac9f0355ea90e310be61f8e0f70ee04e82",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3cabe5e4829e8d58130210b659f0eeadc7350ad799f27abc2a800f399ba46f31",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecallcallcode_101_SuicideEnd_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/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0xeddd6fe26076614a379721871cf7aab636575a4d535b3318d6dbebe5bf37d297",
-                    "mixHash" : "0x6d83f5ae078c12c07b839e06c1fe644edb83cfb2b076dff1be532149da0fcf83",
-                    "nonce" : "0x3d9cda442f8b1ca3",
+                    "hash" : "0x2ac384f10d3e7e0b0fd3ccb32825339f017a37960146d86766dacf62041d0297",
+                    "mixHash" : "0x8e28e8daabadbe8f0318d0ccbfeca595773faa6c3fc5c5a2428df4e7cc654111",
+                    "nonce" : "0x0da7616dbc6e359f",
                     "number" : "0x01",
                     "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
                     "receiptTrie" : "0xf0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a06d83f5ae078c12c07b839e06c1fe644edb83cfb2b076dff1be532149da0fcf83883d9cda442f8b1ca3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a08e28e8daabadbe8f0318d0ccbfeca595773faa6c3fc5c5a2428df4e7cc654111880da7616dbc6e359ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeddd6fe26076614a379721871cf7aab636575a4d535b3318d6dbebe5bf37d297",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2ac384f10d3e7e0b0fd3ccb32825339f017a37960146d86766dacf62041d0297",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_101_SuicideEnd_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/stCallCodes/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x40a12616d5d7b0a6977900b813b0f14525097b4afbb34f683813255d7894349f",
-                    "mixHash" : "0xfdeb79d335f7395e666def02f82ff3df0d650d84124325f5826ccd53cbe36050",
-                    "nonce" : "0x21632ed09de28aab",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0xbe154931154564facd9a4efc51203126a5dfe31d3c9c0bfbea1b26d3cb25bc7b",
+                    "mixHash" : "0x783c54c8c50d488a487a5a565d7f383e2834dfd31f7d1517399a71ec23df56af",
+                    "nonce" : "0xde1b6a5a94bca774",
                     "number" : "0x01",
                     "parentHash" : "0xef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01b",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0x7b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676",
+                    "receiptTrie" : "0xf0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913",
+                    "stateRoot" : "0x73b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b04799b925ea312e4f2e6b287e3f1a7d567945a432480cb0f9389ea5dc11676a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0fdeb79d335f7395e666def02f82ff3df0d650d84124325f5826ccd53cbe360508821632ed09de28aabf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0ef6ff1ca5ea3ac8de8919ab68c594a28b43ab6d2c8cb2b7221a7057bfe5de01ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b172ca5cf59e5bd220e3c30f5ad4e23b87f6e18761370694502cc58bf5da7fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f0f8dfafbfc8d54c88d8bdac12f0e34a5870d083c25403ae49eb7596c70b9913b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0783c54c8c50d488a487a5a565d7f383e2834dfd31f7d1517399a71ec23df56af88de1b6a5a94bca774f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064458663d70db9b7068a3b24b51d74f74d8cbd6c3f7f34240077c7146e3b7044a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40a12616d5d7b0a6977900b813b0f14525097b4afbb34f683813255d7894349f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbe154931154564facd9a4efc51203126a5dfe31d3c9c0bfbea1b26d3cb25bc7b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
index 1851dd9c9..bc175c962 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_101_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcodecallcallcode_101_SuicideMiddle_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/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xc0c630a8373bc649a0519929463c2c1f38ee155a7061b87fe6a6325edfcb4102",
-                    "mixHash" : "0x403d096a04148988268a7c75463395843a81c4735c0b9582293980d3527cc7f7",
-                    "nonce" : "0xb45bd00fa1d56a2d",
+                    "hash" : "0x9f6e530d54355ddd13de54b7c9db7da27c466c15951bfda2011d819794b3d6fb",
+                    "mixHash" : "0xb47eaae1c01cc3a4ce8930e8b91cbbeebdfa73462aefbf0dc13b42abed0ed9cd",
+                    "nonce" : "0x3e1319319184f09c",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
-                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
-                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0403d096a04148988268a7c75463395843a81c4735c0b9582293980d3527cc7f788b45bd00fa1d56a2df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0b47eaae1c01cc3a4ce8930e8b91cbbeebdfa73462aefbf0dc13b42abed0ed9cd883e1319319184f09cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0c630a8373bc649a0519929463c2c1f38ee155a7061b87fe6a6325edfcb4102",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9f6e530d54355ddd13de54b7c9db7da27c466c15951bfda2011d819794b3d6fb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcodecallcallcode_101_SuicideMiddle_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/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xa3fa0111f60770e68818cbcaa6b484ae6edcd7559d68d20f72151c734fc993d5",
-                    "mixHash" : "0xbbb1d6da04a97567a08b96baf19e5f38bd6ebbe4f261b3805ce1c08c8c50c79e",
-                    "nonce" : "0xb0040030080de20f",
+                    "hash" : "0x2fa54a66e1a0b3297557570c7b21edd9d918b02cee01e5e885fbf6ed4da19e87",
+                    "mixHash" : "0xeb13d0d0e8c4cda89922e1cef0bc8db0ce53a1453451a319f63cbfa4569d837a",
+                    "nonce" : "0x5cbcef8341893afb",
+                    "number" : "0x01",
+                    "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0eb13d0d0e8c4cda89922e1cef0bc8db0ce53a1453451a319f63cbfa4569d837a885cbcef8341893afbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fa54a66e1a0b3297557570c7b21edd9d918b02cee01e5e885fbf6ed4da19e87",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x501768f4e0b633059e4deeb10799ae4c34f553ed664b2ef308e21030d25b698f",
+                    "mixHash" : "0xeedcb6b316b708d25af0fc64463e07e55904a984c466859cc8091afb0b06aa1b",
+                    "nonce" : "0xe40f187db26b6718",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
                     "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bbb1d6da04a97567a08b96baf19e5f38bd6ebbe4f261b3805ce1c08c8c50c79e88b0040030080de20ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0eedcb6b316b708d25af0fc64463e07e55904a984c466859cc8091afb0b06aa1b88e40f187db26b6718f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3fa0111f60770e68818cbcaa6b484ae6edcd7559d68d20f72151c734fc993d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x501768f4e0b633059e4deeb10799ae4c34f553ed664b2ef308e21030d25b698f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcodecallcallcode_101_SuicideMiddle_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/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xf14517702b7d37ef5324fece40e61e36c00c460e38c6e97c2e5380e72e9856d7",
-                    "mixHash" : "0x299d9da5381b779c7a9aa41691f93985681e29816e870d44e9af75ce0f6f5d88",
-                    "nonce" : "0xf279b3fdc57a283b",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xb3cf10bcf69a0a8a2cc74c8ad3bb43b00b91546b2f7d60136fc5c750c013fff0",
+                    "mixHash" : "0x3a295a9a2171b7140466ae40bfc1314c5218adcbff142183a80e7018dee28042",
+                    "nonce" : "0xc0bdb06ac6bc6681",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
-                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
-                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
+                    "receiptTrie" : "0x5b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1",
+                    "stateRoot" : "0xc8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0299d9da5381b779c7a9aa41691f93985681e29816e870d44e9af75ce0f6f5d8888f279b3fdc57a283bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f95b8d1e76c9c905cd471dde60f60fcde38bab4875e5216ac68bc51e28fd71a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05b2d90f05193d9583afc47c6a2eb38968c96c315018390d6e942ca7ecc8d06c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03a295a9a2171b7140466ae40bfc1314c5218adcbff142183a80e7018dee2804288c0bdb06ac6bc6681f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf14517702b7d37ef5324fece40e61e36c00c460e38c6e97c2e5380e72e9856d7",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb3cf10bcf69a0a8a2cc74c8ad3bb43b00b91546b2f7d60136fc5c750c013fff0",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcodecallcallcode_101_SuicideMiddle_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/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x3d07c73f58aa4856a31f6ca0962c96d2207b2d533ab7f77d1f495497db32095f",
-                    "mixHash" : "0x4f2596023ec8560acb755fd16d641e4fe66ece6d1d64535cdd75409adf9e9a3a",
-                    "nonce" : "0x9583c81c55a4832f",
+                    "hash" : "0x607ccd4f80ac8f2d43e8976a2ee5f4b82aca8cb29e9a0bd1391a7afcacea4abf",
+                    "mixHash" : "0x875c414be7bd0ccefccb13cca7a03dc05b87786b5c46294bbbadaa3bce291dbf",
+                    "nonce" : "0xd6b50f01b1a4e602",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
                     "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a04f2596023ec8560acb755fd16d641e4fe66ece6d1d64535cdd75409adf9e9a3a889583c81c55a4832ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0875c414be7bd0ccefccb13cca7a03dc05b87786b5c46294bbbadaa3bce291dbf88d6b50f01b1a4e602f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d07c73f58aa4856a31f6ca0962c96d2207b2d533ab7f77d1f495497db32095f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x607ccd4f80ac8f2d43e8976a2ee5f4b82aca8cb29e9a0bd1391a7afcacea4abf",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_101_SuicideMiddle_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/stCallCodes/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0xca9566a986096c28f277035e200a55763e37fdaead3c0234a2b9fba57de0b9a0",
-                    "mixHash" : "0x443aeeef21f2760a0fe5c6e76befcf2c4ec608b324c06b5a71dc853b6403b017",
-                    "nonce" : "0x26f5d6772b16ad89",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x709205b69560fe7c3db2b5f5ef5db9cf032d57d1ac003d61ddb78f7cb7663750",
+                    "mixHash" : "0xf011cea0a92a9d07a7bcdd5d4dcb3821f18bc82a33db2a7d6c0e529b2627fc5c",
+                    "nonce" : "0xd02a42cecc63f355",
                     "number" : "0x01",
                     "parentHash" : "0x588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0xbebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22",
+                    "receiptTrie" : "0xeec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6",
+                    "stateRoot" : "0x9803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bebbbd99c1481b46db83269271b08fb4a04310c15693e73c7086ef187b508d22a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0443aeeef21f2760a0fe5c6e76befcf2c4ec608b324c06b5a71dc853b6403b0178826f5d6772b16ad89f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0588cb7ed7673894eac435fa79769ac1b508d13e746aca0fc699468c720f91cb0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09803dcf2f868c40ef5f1f78fcef90b9bbad648aa51f773e8ac3cec56edd2306ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eec8cda126c8c4c3d36d6fe6e22238746389e1ba2ca2ff78ca071fff194c3dd6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0f011cea0a92a9d07a7bcdd5d4dcb3821f18bc82a33db2a7d6c0e529b2627fc5c88d02a42cecc63f355f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022216ac3f5503e4304d8344dc9d65a039db66fe4a17fdb3bb7f34e32adec80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca9566a986096c28f277035e200a55763e37fdaead3c0234a2b9fba57de0b9a0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x709205b69560fe7c3db2b5f5ef5db9cf032d57d1ac003d61ddb78f7cb7663750",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_d0g0v0.json
index 6a24d1738..5d247b0d0 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_101_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_101_d0g0v0_EIP150" : {
+    "callcodecallcallcode_101_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/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0xee75c6ef3baf9a19155fa0c72c551dead763a2ebb427107b7300ae259ee40d9b",
-                    "mixHash" : "0x7c9ea2c2df029121b4dd63fa5e353e8f635f55392c089521f4ed9e4c32871150",
-                    "nonce" : "0xc8ba68dc458aba93",
+                    "hash" : "0x3cd4f78b5bb10a22db6dd44687f01753e89cf074cc5db7bfba3fbee43c8afbbf",
+                    "mixHash" : "0x91f79d8d57cf0321609f2bd0e9fc8915e3d74489eaca7fb9652c6f2cc5712d31",
+                    "nonce" : "0x0af95d15b0a43ea0",
                     "number" : "0x01",
                     "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "0x3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
-                    "stateRoot" : "0xdf3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x7680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07c9ea2c2df029121b4dd63fa5e353e8f635f55392c089521f4ed9e4c3287115088c8ba68dc458aba93f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeffa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a091f79d8d57cf0321609f2bd0e9fc8915e3d74489eaca7fb9652c6f2cc5712d31880af95d15b0a43ea0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee75c6ef3baf9a19155fa0c72c551dead763a2ebb427107b7300ae259ee40d9b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3cd4f78b5bb10a22db6dd44687f01753e89cf074cc5db7bfba3fbee43c8afbbf",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_d0g0v0_EIP158" : {
+    "callcodecallcallcode_101_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/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x8e4b488c66a30f81e95aa969b9cd1eccc9b37157cea2b30b9e484e7f6f5d6919",
-                    "mixHash" : "0x25e89c701dea2d4b3ac6881d1f3bf28ac2d31c487cc14d927594f495207fbb05",
-                    "nonce" : "0xafc993f97ac00f8c",
+                    "hash" : "0x039db13d314c0e16c74b4d9878e1ee560abdbd362ae33aef61591a85f9cea0aa",
+                    "mixHash" : "0x6049a51e497c8d8cfa7229c6f49568afb0346385b9cfb8e44966d371adcad247",
+                    "nonce" : "0x386c02798920b335",
+                    "number" : "0x01",
+                    "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x7680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeffa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a06049a51e497c8d8cfa7229c6f49568afb0346385b9cfb8e44966d371adcad24788386c02798920b335f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x039db13d314c0e16c74b4d9878e1ee560abdbd362ae33aef61591a85f9cea0aa",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763fffe",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640002",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x014a" : "0x1000000000000000000000000000000000000002",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000002",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x1d87152c6e98ef6035f694eff773dca9872f59aaa4f3b2e7dcfb56a68a3ac034",
+                    "mixHash" : "0x29c0f670265d03eb7b90e317f211dfd44219b8aa0a704641bf39624c50871664",
+                    "nonce" : "0x2326c7182365bd38",
                     "number" : "0x01",
                     "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
                     "receiptTrie" : "0x3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a025e89c701dea2d4b3ac6881d1f3bf28ac2d31c487cc14d927594f495207fbb0588afc993f97ac00f8cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a029c0f670265d03eb7b90e317f211dfd44219b8aa0a704641bf39624c50871664882326c7182365bd38f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e4b488c66a30f81e95aa969b9cd1eccc9b37157cea2b30b9e484e7f6f5d6919",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1d87152c6e98ef6035f694eff773dca9872f59aaa4f3b2e7dcfb56a68a3ac034",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_d0g0v0_Frontier" : {
+    "callcodecallcallcode_101_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/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0x83a8e0a8cf89a228b7a335d36d1b93591edc554652a193e4289076d8c15690cb",
-                    "mixHash" : "0xcf0263d6898498315b27d530f1ff214bfe7385f2a083731b220d0e2f442997cb",
-                    "nonce" : "0xe763ca3e02283f0d",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x0dcad143edb034de424c2fe4348498e5f658b79930a73e38ca0542135ede2062",
+                    "mixHash" : "0x19ce276b24fc82cc87bfb05e0ea428e7dbafb85d9870774904c9ebc0f57e0c9b",
+                    "nonce" : "0xddb35e04a6999fa8",
                     "number" : "0x01",
                     "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "0x1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
-                    "stateRoot" : "0x65c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8c",
+                    "receiptTrie" : "0x3e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453",
+                    "stateRoot" : "0xdf3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0cf0263d6898498315b27d530f1ff214bfe7385f2a083731b220d0e2f442997cb88e763ca3e02283f0df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df3d2b12b746e42dd2f4e3890485aa85a6fefecf0baa6e457ce631a22ab3ee49a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03e92235c7fcde08dbc6c1380d585b9aa524d8769080a7997cea6924fcdda9453b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a019ce276b24fc82cc87bfb05e0ea428e7dbafb85d9870774904c9ebc0f57e0c9b88ddb35e04a6999fa8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83a8e0a8cf89a228b7a335d36d1b93591edc554652a193e4289076d8c15690cb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0dcad143edb034de424c2fe4348498e5f658b79930a73e38ca0542135ede2062",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_d0g0v0_Homestead" : {
+    "callcodecallcallcode_101_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/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0x3f69cf64193b2d4aa5e35713061fa540137ec28c910da66e7d3f2cdd0379c953",
-                    "mixHash" : "0x33a666530a4c6cee73dd3a531d7acd97c65006dfb7eea70024a181bd08cd7fbe",
-                    "nonce" : "0x37cc4b0e44e3212b",
+                    "hash" : "0x3f658275f5dd4f8cfc52397016cdc56e07e93131e5c4090a31dae5981ae15ac0",
+                    "mixHash" : "0x3e1251293d675022fde070fc7ba0ba3fedd52d449498c29a8ad183e946e1556c",
+                    "nonce" : "0xcf3c27bc9aa838bc",
                     "number" : "0x01",
                     "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
                     "receiptTrie" : "0x1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a033a666530a4c6cee73dd3a531d7acd97c65006dfb7eea70024a181bd08cd7fbe8837cc4b0e44e3212bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a03e1251293d675022fde070fc7ba0ba3fedd52d449498c29a8ad183e946e1556c88cf3c27bc9aa838bcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f69cf64193b2d4aa5e35713061fa540137ec28c910da66e7d3f2cdd0379c953",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3f658275f5dd4f8cfc52397016cdc56e07e93131e5c4090a31dae5981ae15ac0",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcodecallcallcode_101_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_101_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/stCallCodes/callcodecallcallcode_101_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0xe2652eead9d248ecb17c7fed03211c1a04fbba180dffea0106652520c3feb007",
-                    "mixHash" : "0x7e729d7a09ab24a499076d34cdd0f8431accf867f176f271a1889e6a0ecefb9d",
-                    "nonce" : "0xcbc1ab0db3154d9c",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0xcb4c9e87742c6721781aa1cf7792d42d84ecd5fef3078722ee3f43f59bc90acd",
+                    "mixHash" : "0xd6dbea74a40d3159854f07e44b00c317e48585521df06e496f3c69cac159c177",
+                    "nonce" : "0x269c5190208e5ba2",
                     "number" : "0x01",
                     "parentHash" : "0x07d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0x7680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeff",
+                    "receiptTrie" : "0x1fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23cc",
+                    "stateRoot" : "0x65c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07680b656fb2d8b070e2213e3d7115c22b9cde0a949a387ba693bdf1e8e4eaeffa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07e729d7a09ab24a499076d34cdd0f8431accf867f176f271a1889e6a0ecefb9d88cbc1ab0db3154d9cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a007d2c2a171656809e2b8bec2f7fcf8d5ccd3ac39bed39ba045b621eaa80f5448a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa065c204badda1ce7bd62798ca23f2be47a5a5b5a9183ae840289875bb0b5c8a8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01fbd214332417a6af0024b4b0a08edfbc9906c2b51ae6d774aac9a1916bd23ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0d6dbea74a40d3159854f07e44b00c317e48585521df06e496f3c69cac159c17788269c5190208e5ba2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb8982784f363701968472a1d055469ac08e0a731e753e19b8b11c4e25a294a8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2652eead9d248ecb17c7fed03211c1a04fbba180dffea0106652520c3feb007",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcb4c9e87742c6721781aa1cf7792d42d84ecd5fef3078722ee3f43f59bc90acd",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffe",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
index 531223353..429e46604 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcodecallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xa0e32b24a4cf22eb6da84dca126fd8c655c723aa86cc2136d478f904115d5ad1",
-                    "mixHash" : "0x9e7f7414143151cf1f914e1f81637ba2a4d29f4f860528f1517f9844a7b3a0fb",
-                    "nonce" : "0x54f7b08eae5cf9e7",
+                    "hash" : "0x233c152e4d3878e4ba9e112f5e6a25126179c4bf13453b4383dda39a2caa595a",
+                    "mixHash" : "0xf7b9c2937f1e8d8e47ca46931f69d811c708bcbbedbaa2b19770ff694bee3ec8",
+                    "nonce" : "0x0c60f5dda0bb50a0",
                     "number" : "0x01",
                     "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "0xd6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
-                    "stateRoot" : "0xfc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3b",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xfbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a09e7f7414143151cf1f914e1f81637ba2a4d29f4f860528f1517f9844a7b3a0fb8854f7b08eae5cf9e7f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0f7b9c2937f1e8d8e47ca46931f69d811c708bcbbedbaa2b19770ff694bee3ec8880c60f5dda0bb50a0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0e32b24a4cf22eb6da84dca126fd8c655c723aa86cc2136d478f904115d5ad1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x233c152e4d3878e4ba9e112f5e6a25126179c4bf13453b4383dda39a2caa595a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0xe46d3ee3f00f954b9999b1a9c2da9495e958eb00366511a5ad1431adf6284232",
+                    "mixHash" : "0x63f3d28a26b72333959d373d3bf5246155757645e722a94eb3450c954f71ea10",
+                    "nonce" : "0x92113d3051d02ec8",
+                    "number" : "0x01",
+                    "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xfbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a063f3d28a26b72333959d373d3bf5246155757645e722a94eb3450c954f71ea108892113d3051d02ec8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe46d3ee3f00f954b9999b1a9c2da9495e958eb00366511a5ad1431adf6284232",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0x1bbabb3a262d15f09babc4c1fa551a69db92f8b346e3ace4c690e06f5f3188c2",
-                    "mixHash" : "0xa83f7939439f6beb137bd67e728416ca41136fd52fa416f7c562a06431ebc594",
-                    "nonce" : "0x0e54bea992832777",
+                    "hash" : "0xc2bffd1c345e3e7d8ab752bf798f27e01ebeee602661d497de52037b300137f0",
+                    "mixHash" : "0x2858362af1b8abb2641f0f2df2b379b1264eec4fa6e53b28d9576c6f4d5f2cc5",
+                    "nonce" : "0xe212e6d192b20f87",
                     "number" : "0x01",
                     "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
                     "receiptTrie" : "0xd6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0a83f7939439f6beb137bd67e728416ca41136fd52fa416f7c562a06431ebc594880e54bea992832777f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a02858362af1b8abb2641f0f2df2b379b1264eec4fa6e53b28d9576c6f4d5f2cc588e212e6d192b20f87f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1bbabb3a262d15f09babc4c1fa551a69db92f8b346e3ace4c690e06f5f3188c2",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc2bffd1c345e3e7d8ab752bf798f27e01ebeee602661d497de52037b300137f0",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcodecallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0xddb1334da84da41cb1927559e588fff31fbe1297299e59e232c0d24e2ce2ae74",
-                    "mixHash" : "0x78b93225f5cccad96ab93514b58d63b6bec12b8ab37c713a90f4856dd4663a50",
-                    "nonce" : "0x8a2dbae41fc84fea",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x7e193edf2e24d116799f7a3f6155a3201dd85de4906aa6a26f8691444b75a6b4",
+                    "mixHash" : "0xae997fde45b815f48025208c3fafbb3cf4f383c7e7968709a153fc11fcdd22f0",
+                    "nonce" : "0x1304122c58ce508b",
                     "number" : "0x01",
                     "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "0x77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
-                    "stateRoot" : "0x2afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505",
+                    "receiptTrie" : "0xd6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382",
+                    "stateRoot" : "0xfc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a078b93225f5cccad96ab93514b58d63b6bec12b8ab37c713a90f4856dd4663a50888a2dbae41fc84feaf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7d7137077a00a4a223bc6f063748f041055e53aefc85782ee2ae5e06a63a3ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d6f242a48de75d3a8bca6ff1ffa5a6cbb903c09ac072da6a734b244e480c4382b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ae997fde45b815f48025208c3fafbb3cf4f383c7e7968709a153fc11fcdd22f0881304122c58ce508bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xddb1334da84da41cb1927559e588fff31fbe1297299e59e232c0d24e2ce2ae74",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7e193edf2e24d116799f7a3f6155a3201dd85de4906aa6a26f8691444b75a6b4",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcodecallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x7599e26e8f165ec82d3da3041ad9c20dd219ab6abb7b3a7e1d238a1db457fd71",
-                    "mixHash" : "0xbfcb50ca9b79e03c7c940baac6f033262856919bb157574a3abd0a5010b75fe2",
-                    "nonce" : "0x9e1d3ed06e1f201e",
+                    "hash" : "0x4ee73ade8ee6f1b53089105edae2060875bab33a801381387b6c52df513cd9f4",
+                    "mixHash" : "0x763aa9449a08128deadf349edb96d47a1e99dfc6c41d90be3085fd4228ca0b66",
+                    "nonce" : "0x0e0d4fbaaec3ee04",
                     "number" : "0x01",
                     "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
                     "receiptTrie" : "0x77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0bfcb50ca9b79e03c7c940baac6f033262856919bb157574a3abd0a5010b75fe2889e1d3ed06e1f201ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0763aa9449a08128deadf349edb96d47a1e99dfc6c41d90be3085fd4228ca0b66880e0d4fbaaec3ee04f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7599e26e8f165ec82d3da3041ad9c20dd219ab6abb7b3a7e1d238a1db457fd71",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4ee73ade8ee6f1b53089105edae2060875bab33a801381387b6c52df513cd9f4",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcodecallcallcode_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcodecallcallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0x89b0a3c2d8d851ff620be6e5761f252cbb0793d55f094e9fd2d2aa820bc7fdbd",
-                    "mixHash" : "0x3eb8b9ce1f2f31ecdb05b100739e25359c2c1c0380903955615ee58603bad69c",
-                    "nonce" : "0x29b8082854bf510c",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0xaa23d4e99f3f098e1c740a2aade9fd9aad94f5eff9d8755e1bb5ca3062fc159c",
+                    "mixHash" : "0xb90d8d5a0b1ebb3cf65f52fa106cc641680c78d907f432a74cd8770ff4ec1e4d",
+                    "nonce" : "0xcef837867c8a8833",
                     "number" : "0x01",
                     "parentHash" : "0x4681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1b",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0xfbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87",
+                    "receiptTrie" : "0x77531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5d",
+                    "stateRoot" : "0x2afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbf835b13f8fb544cb6976cc34a1790451d4e61bf8d00d1d097d591968590d87a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a03eb8b9ce1f2f31ecdb05b100739e25359c2c1c0380903955615ee58603bad69c8829b8082854bf510cf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a04681afe9580f6d3abaedfc0f88d314f83405e0a1779ec0dc2dd2ccb038542b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02afcdf013ab74e1a1b3fadfbcc55490a056eab2df2af0fcbce99e7296c82b505a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077531219a32f72468802bc385b1fcf932da48fc010ee55ed577ffb015d800a5db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0b90d8d5a0b1ebb3cf65f52fa106cc641680c78d907f432a74cd8770ff4ec1e4d88cef837867c8a8833f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5c007588caeb0a5319c1be78c0c0b68d6d9e363a095e4d76c621e5483947e11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89b0a3c2d8d851ff620be6e5761f252cbb0793d55f094e9fd2d2aa820bc7fdbd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xaa23d4e99f3f098e1c740a2aade9fd9aad94f5eff9d8755e1bb5ca3062fc159c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE_d0g0v0.json
index 7761932a7..1da4c3813 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcode_11_OOGE_d0g0v0_EIP150" : {
+    "callcodecallcode_11_OOGE_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/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0xf2bb91dada9dd089231e3d504cdbd498516bf19643331ecf74bca93ae6adb734",
-                    "mixHash" : "0x672d596620e370ea1e3419bb331309a2649ca3d0a0c9eea2f2625a4c71b018d5",
-                    "nonce" : "0x6ebe08f4f2b63e49",
+                    "hash" : "0x100f2d607551427a6c763cce0c978fde43bdf8eb764f7226ed28b0283c76621c",
+                    "mixHash" : "0x61dc05aabdb8d529a71aea75d41f3493b42d7d14d97471027cb8df0e125c91bc",
+                    "nonce" : "0xca6e366b6cb4104c",
                     "number" : "0x01",
                     "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "0xad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
-                    "stateRoot" : "0xdb4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0x674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0672d596620e370ea1e3419bb331309a2649ca3d0a0c9eea2f2625a4c71b018d5886ebe08f4f2b63e49f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a061dc05aabdb8d529a71aea75d41f3493b42d7d14d97471027cb8df0e125c91bc88ca6e366b6cb4104cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2bb91dada9dd089231e3d504cdbd498516bf19643331ecf74bca93ae6adb734",
-        "network" : "EIP150",
+        "lastblockhash" : "0x100f2d607551427a6c763cce0c978fde43bdf8eb764f7226ed28b0283c76621c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -133,10 +140,10 @@
             }
         }
     },
-    "callcodecallcode_11_OOGE_d0g0v0_EIP158" : {
+    "callcodecallcode_11_OOGE_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/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -148,9 +155,150 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010798",
-                    "hash" : "0xde0b339f7261b9d587565c474825904e17c5f8a2bc6c24f687cbd6e7958e5de6",
-                    "mixHash" : "0x17615f1bed183bf8ce3c0c13ed389d144e8dc30277608e9f56ec766db2af466b",
-                    "nonce" : "0x2d0204950ca4cf26",
+                    "hash" : "0xc8b8c8a1ae0b4b8944a8331ba265d4c9b99ecb9dca08e650c2fa2cbc57efe2f3",
+                    "mixHash" : "0x1e63e95f22af3acf03c73ebe7ba9d463cabbb1fb9eeeea5c9ead25edc2d069bb",
+                    "nonce" : "0xb1dc68e1ec1b0059",
+                    "number" : "0x01",
+                    "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
+                    "stateRoot" : "0x674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a01e63e95f22af3acf03c73ebe7ba9d463cabbb1fb9eeeea5c9ead25edc2d069bb88b1dc68e1ec1b0059f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6da",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc8b8c8a1ae0b4b8944a8331ba265d4c9b99ecb9dca08e650c2fa2cbc57efe2f3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50798",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762f868",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcode_11_OOGE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x27cd9a076e61c03c8f2cd7df0dfb5f2a60b9fc141c806359936f3b727c9a9e87",
+                    "mixHash" : "0xbfaf28076b0aca61aae6a648034ae42c6df3182e5538611e43111bdfb5836f13",
+                    "nonce" : "0xf653dc0adc7b233b",
                     "number" : "0x01",
                     "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
                     "receiptTrie" : "0xad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
@@ -159,7 +307,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a017615f1bed183bf8ce3c0c13ed389d144e8dc30277608e9f56ec766db2af466b882d0204950ca4cf26f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0bfaf28076b0aca61aae6a648034ae42c6df3182e5538611e43111bdfb5836f1388f653dc0adc7b233bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -196,8 +344,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde0b339f7261b9d587565c474825904e17c5f8a2bc6c24f687cbd6e7958e5de6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x27cd9a076e61c03c8f2cd7df0dfb5f2a60b9fc141c806359936f3b727c9a9e87",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -267,10 +415,10 @@
             }
         }
     },
-    "callcodecallcode_11_OOGE_d0g0v0_Frontier" : {
+    "callcodecallcode_11_OOGE_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/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +429,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010270",
-                    "hash" : "0x5370e5c8a9aaece7c309776253be50fe6b364aa42ca311b2023c927e5139e401",
-                    "mixHash" : "0x7a261e4bac8a433f55e6b81a19ad5ef970135a28276df34200a008c78ed01033",
-                    "nonce" : "0x6b226a528335346e",
+                    "gasUsed" : "0x010798",
+                    "hash" : "0x5f8bdc4e28bd12e1fc8c13d6bde28eac3209404a10b0f350d8a86355a09b9e7e",
+                    "mixHash" : "0xb5c005dc38b892aa3241118793bf5da077f6b524a99268a79f1294c4f5515f10",
+                    "nonce" : "0x01b638a98072156e",
                     "number" : "0x01",
                     "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "0x03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
-                    "stateRoot" : "0x202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0",
+                    "receiptTrie" : "0xad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837",
+                    "stateRoot" : "0xdb4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a07a261e4bac8a433f55e6b81a19ad5ef970135a28276df34200a008c78ed01033886b226a528335346ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db4ede1864b9058d891f415e37aa3b34c09f63fe033bcf1728c7945514f8a314a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ad220872c50d0045fe32b6b3216956a56b39c2637f3df3a921cc4f3268721837b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a0b5c005dc38b892aa3241118793bf5da077f6b524a99268a79f1294c4f5515f108801b638a98072156ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -330,8 +478,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5370e5c8a9aaece7c309776253be50fe6b364aa42ca311b2023c927e5139e401",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5f8bdc4e28bd12e1fc8c13d6bde28eac3209404a10b0f350d8a86355a09b9e7e",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,14 +504,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50270",
+                "balance" : "0x4563918244f50798",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd90",
+                "balance" : "0x0de0b6b3a762f868",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -401,10 +549,10 @@
             }
         }
     },
-    "callcodecallcode_11_OOGE_d0g0v0_Homestead" : {
+    "callcodecallcode_11_OOGE_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/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -416,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010270",
-                    "hash" : "0xf4dd5b414234cac816b1d1796a82e9371403280a993b3f0784c4eef41f698ef3",
-                    "mixHash" : "0xfad08b65740c94b9c82ca2a58291440b83a9c8864fa90c28415fb374a37de521",
-                    "nonce" : "0xc2466e9faea4679e",
+                    "hash" : "0x76f76e461447d5d08e65a58656a86c644718d89cb3dc8f0368d7e81c977123a6",
+                    "mixHash" : "0x14b5a30331912f87075a7cce5345717a27c3fdec90a2359913c7ec926b086a59",
+                    "nonce" : "0x8cc34079d586c290",
                     "number" : "0x01",
                     "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
                     "receiptTrie" : "0x03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
@@ -427,7 +575,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0fad08b65740c94b9c82ca2a58291440b83a9c8864fa90c28415fb374a37de52188c2466e9faea4679ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a014b5a30331912f87075a7cce5345717a27c3fdec90a2359913c7ec926b086a59888cc34079d586c290f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -464,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4dd5b414234cac816b1d1796a82e9371403280a993b3f0784c4eef41f698ef3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x76f76e461447d5d08e65a58656a86c644718d89cb3dc8f0368d7e81c977123a6",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -535,10 +683,10 @@
             }
         }
     },
-    "callcodecallcode_11_OOGE_d0g0v0_Metropolis" : {
+    "callcodecallcode_11_OOGE_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/stCallCodes/callcodecallcode_11_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -549,19 +697,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010798",
-                    "hash" : "0x73e840e283edd31c826dbdb0f510e0c403ff9e230b57eedcb938076d0f6d7608",
-                    "mixHash" : "0x5389f6e0fa7ef599b287db74467f0dc5f89a60d3ee28b6c7729decce93fcf5e7",
-                    "nonce" : "0xc3c9b257f24fe3a1",
+                    "gasUsed" : "0x010270",
+                    "hash" : "0x42a91681d6935793d4756e41601aa7418f6a89a16f76b1b3d7c4f2be0b49063a",
+                    "mixHash" : "0xd668258d997886bd57f2ddd487871e135a9ffc81af3b564d33588d6b9c574471",
+                    "nonce" : "0x4e8397a76ced7d9e",
                     "number" : "0x01",
                     "parentHash" : "0x16bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6e",
-                    "receiptTrie" : "0xfca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834",
-                    "stateRoot" : "0x674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19",
+                    "receiptTrie" : "0x03216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ce",
+                    "stateRoot" : "0x202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0674fdca1e2caa12e7e3599b4916fd3d7311c6613754bc55b0aa8c24d15702a19a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fca57bc617bd4b9e64dcc79458324bead022eb1f61cb01a8a2ced11ca027e834b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107988203e880a05389f6e0fa7ef599b287db74467f0dc5f89a60d3ee28b6c7729decce93fcf5e788c3c9b257f24fe3a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a016bb5c1c05a3a792cee50570a3ea47bf3c101221581ac88eb27add6f3f43fa6ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0202af989c5b975bf62485eee13f1c5348bf1243d5728aa9a7896fe5a3856c3d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea003216b12c323d637ba1554221bf6599d1fbc361bb9c0c55666b85347ca46b6ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830102708203e880a0d668258d997886bd57f2ddd487871e135a9ffc81af3b564d33588d6b9c574471884e8397a76ced7d9ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -598,16 +746,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ecbc687c2e625609d36f46087ff00c7031395a09f7d3d3f240a22e480f5d6daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73e840e283edd31c826dbdb0f510e0c403ff9e230b57eedcb938076d0f6d7608",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x42a91681d6935793d4756e41601aa7418f6a89a16f76b1b3d7c4f2be0b49063a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -631,14 +772,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50798",
+                "balance" : "0x4563918244f50270",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f868",
+                "balance" : "0x0de0b6b3a762fd90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
index 51e863ed7..845abb33b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcode_11_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x07465001497f4cfb8a1703bbf83afd0293c83842d1b1c2d7ca861c07141d20e4",
-                    "mixHash" : "0x122ac8bb4d5186723ae4e19f8b83a7123d99ad74d1bbc330f68cf8833da12038",
-                    "nonce" : "0x85c7d328a10375ab",
+                    "hash" : "0x56b53f79d33c6ff101ba4ba2432b3791943c015cb78975fd81111b35088a7fa7",
+                    "mixHash" : "0xb31f0bc7b21bc514e0113c2bcb0d0036e668d4408b6f160e9e0608185da176ef",
+                    "nonce" : "0x361cec61debdf08b",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
-                    "stateRoot" : "0x545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0122ac8bb4d5186723ae4e19f8b83a7123d99ad74d1bbc330f68cf8833da120388885c7d328a10375abf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0b31f0bc7b21bc514e0113c2bcb0d0036e668d4408b6f160e9e0608185da176ef88361cec61debdf08bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07465001497f4cfb8a1703bbf83afd0293c83842d1b1c2d7ca861c07141d20e4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x56b53f79d33c6ff101ba4ba2432b3791943c015cb78975fd81111b35088a7fa7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
@@ -125,10 +132,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -140,9 +147,142 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x343e723007b5fdc0174ffcaf65941ecc9985c1400edbaa3544188c81019e6933",
-                    "mixHash" : "0xfa307f9d157bb051547b0b1a24251f83192788ca209e6c57dc675895cfb9e165",
-                    "nonce" : "0xadc9bed94ef7d796",
+                    "hash" : "0x70aea183c596eb5ad9e503018574cb6d07cdb125d8a8b1ba2a11475b2e98b2d8",
+                    "mixHash" : "0x62c25837ea3950dc21e8f0ce4e763b146bff9ede88f4ad157910015e9e27f566",
+                    "nonce" : "0xa0d322e7a2655a5a",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a062c25837ea3950dc21e8f0ce4e763b146bff9ede88f4ad157910015e9e27f56688a0d322e7a2655a5af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70aea183c596eb5ad9e503018574cb6d07cdb125d8a8b1ba2a11475b2e98b2d8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f7ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630813",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcode_11_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xf097ecfae6ea0c92708a2991e942aed6a31362cd7d57958b3a6bb193e5e4eac8",
+                    "mixHash" : "0xcf2884323a7bddb11091bfe611d29170563eefa2e68c9fce756f9bc65021a44a",
+                    "nonce" : "0xcbc67b08d2be8a8d",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
                     "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
@@ -151,7 +291,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0fa307f9d157bb051547b0b1a24251f83192788ca209e6c57dc675895cfb9e16588adc9bed94ef7d796f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0cf2884323a7bddb11091bfe611d29170563eefa2e68c9fce756f9bc65021a44a88cbc67b08d2be8a8df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -188,8 +328,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x343e723007b5fdc0174ffcaf65941ecc9985c1400edbaa3544188c81019e6933",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf097ecfae6ea0c92708a2991e942aed6a31362cd7d57958b3a6bb193e5e4eac8",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -251,10 +391,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -265,19 +405,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3d",
-                    "hash" : "0xfe5ca741b3c77c732a17d19e10c281067549a119b43c37a41e3eebb60f637d33",
-                    "mixHash" : "0x7e0bf498238044a6754c1f012ae7ed9362ca83122741aa66002fedf421d2d5c7",
-                    "nonce" : "0x1faab22254d56bba",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xcbe0a003b639bd19a6370e81eaac0604ce3b96198773f88870cd816272475294",
+                    "mixHash" : "0x81ce6140fd491dcfdfb7d7ff1dd2c3c253b77750f383b486b3fd8039a247a1b6",
+                    "nonce" : "0xf17c965e9017fa65",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
-                    "stateRoot" : "0x981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
+                    "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
+                    "stateRoot" : "0x545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a07e0bf498238044a6754c1f012ae7ed9362ca83122741aa66002fedf421d2d5c7881faab22254d56bbaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a081ce6140fd491dcfdfb7d7ff1dd2c3c253b77750f383b486b3fd8039a247a1b688f17c965e9017fa65f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -314,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe5ca741b3c77c732a17d19e10c281067549a119b43c37a41e3eebb60f637d33",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcbe0a003b639bd19a6370e81eaac0604ce3b96198773f88870cd816272475294",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -332,14 +472,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3d",
+                "balance" : "0x4563918244f4f7ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c3",
+                "balance" : "0x0de0b6b3a7630813",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +517,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +532,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0x2f6ea8046b0b6c05c73d72c27de730a76dbf77259a14ceddbd5637fc74de8b47",
-                    "mixHash" : "0xf2ffa974b8fced7831865c0a7369048d11ac704c3021b491ca84faad9ad9ac5f",
-                    "nonce" : "0xabaf4a88833df356",
+                    "hash" : "0x44e3f5e271cf6d21d0ab5f666e29d34472ddadc8e1a61a022fab12991983a8c1",
+                    "mixHash" : "0x5befca160dca67b8a2cef008cc9b31a5bf64f0bbd15108de42b457e3a9a35447",
+                    "nonce" : "0x9f3dbf868cc04890",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
                     "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
@@ -403,7 +543,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0f2ffa974b8fced7831865c0a7369048d11ac704c3021b491ca84faad9ad9ac5f88abaf4a88833df356f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a05befca160dca67b8a2cef008cc9b31a5bf64f0bbd15108de42b457e3a9a35447889f3dbf868cc04890f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -440,8 +580,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f6ea8046b0b6c05c73d72c27de730a76dbf77259a14ceddbd5637fc74de8b47",
-        "network" : "Homestead",
+        "lastblockhash" : "0x44e3f5e271cf6d21d0ab5f666e29d34472ddadc8e1a61a022fab12991983a8c1",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -503,10 +643,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -517,19 +657,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ed",
-                    "hash" : "0x65a7aa3dc70b6e36969c7742aa41512337d85a30d6d042027501a48dbee5ec7f",
-                    "mixHash" : "0xca39c81432a4e75c2d2476b9e14f81c0753864da6635ca0560faceecd6287855",
-                    "nonce" : "0x487d9dcae454e258",
+                    "gasUsed" : "0xdf3d",
+                    "hash" : "0xe1181c664a90f932e7b5b296cd9d1a62daf7925662b210ca6fba0160734e7451",
+                    "mixHash" : "0x0e2d3e71aeb207ec3fae3e4e200424940fe6720d9184dd87f50114e2d6f518e5",
+                    "nonce" : "0x6047df41555d34a9",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
-                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
+                    "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
+                    "stateRoot" : "0x981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0ca39c81432a4e75c2d2476b9e14f81c0753864da6635ca0560faceecd628785588487d9dcae454e258f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a00e2d3e71aeb207ec3fae3e4e200424940fe6720d9184dd87f50114e2d6f518e5886047df41555d34a9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -566,16 +706,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65a7aa3dc70b6e36969c7742aa41512337d85a30d6d042027501a48dbee5ec7f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe1181c664a90f932e7b5b296cd9d1a62daf7925662b210ca6fba0160734e7451",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
@@ -591,14 +724,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ed",
+                "balance" : "0x4563918244f4df3d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630813",
+                "balance" : "0x0de0b6b3a76320c3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_d0g0v0.json
index f46e20c66..628a07802 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcode_11_d0g0v0_EIP150" : {
+    "callcodecallcode_11_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/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0xbf077e9d04903d0d067c9f924de4cbdc2f771806c87db6dfa3f7b198bd66cd20",
-                    "mixHash" : "0x0df5f0aca55ffc0f14300a3f1247744d9f9e696595ecefbbbbe74efe49ea6b8f",
-                    "nonce" : "0xca7d14f5a6521e4e",
+                    "hash" : "0xdecf3b92e4955cd43292ec01077511a1ce5760a6ceae1e63ff66eb1c778817e9",
+                    "mixHash" : "0x5cc70307e35f1e99fa5246a1678a6ab1945eab29950293c2d0b988beea2a105a",
+                    "nonce" : "0x406bc009af15955c",
                     "number" : "0x01",
                     "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "0x3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
-                    "stateRoot" : "0x99c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1e",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a00df5f0aca55ffc0f14300a3f1247744d9f9e696595ecefbbbbe74efe49ea6b8f88ca7d14f5a6521e4ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a05cc70307e35f1e99fa5246a1678a6ab1945eab29950293c2d0b988beea2a105a88406bc009af15955cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf077e9d04903d0d067c9f924de4cbdc2f771806c87db6dfa3f7b198bd66cd20",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdecf3b92e4955cd43292ec01077511a1ce5760a6ceae1e63ff66eb1c778817e9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -142,10 +149,160 @@
             }
         }
     },
-    "callcodecallcode_11_d0g0v0_EIP158" : {
+    "callcodecallcode_11_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0x639ec9c5cc325db41825a9f62f8897a32f6e62022cfb73d2664928b9e7385cdf",
+                    "mixHash" : "0x43f1d9520f237d217e858bdc507754d0e8b70a3a58ed4422e756c9f07a1a2b37",
+                    "nonce" : "0x9613988719586f28",
+                    "number" : "0x01",
+                    "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
+                    "stateRoot" : "0x830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a043f1d9520f237d217e858bdc507754d0e8b70a3a58ed4422e756c9f07a1a2b37889613988719586f28f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x639ec9c5cc325db41825a9f62f8897a32f6e62022cfb73d2664928b9e7385cdf",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000000",
+                    "0x07" : "0x02",
+                    "0xe6" : "0x1000000000000000000000000000000000000000",
+                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0xec" : "0x40",
+                    "0xee" : "0x21",
+                    "0xf0" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f7997d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7606683",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcode_11_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/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -157,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03997d",
-                    "hash" : "0xaf0607494bcee64a2eb443cb82e8c7c434fa273cf6096842b26944695a462119",
-                    "mixHash" : "0x65c8e1b773b7ef73de554df8fd85e376556f2f95c6ae6b299d0c32bfc5692553",
-                    "nonce" : "0xd161f979b8cedd96",
+                    "hash" : "0x1214bbd780757bdc2e32e576717aefba77773942c2e63d511f6e1eea735cc437",
+                    "mixHash" : "0x6e1cbb868fb223da35f8aa448d59ced324ae75999a462573fb4d376f8b1b22ef",
+                    "nonce" : "0x42597f7a5e69cb2f",
                     "number" : "0x01",
                     "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
                     "receiptTrie" : "0x3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
@@ -168,7 +325,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a065c8e1b773b7ef73de554df8fd85e376556f2f95c6ae6b299d0c32bfc569255388d161f979b8cedd96f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a06e1cbb868fb223da35f8aa448d59ced324ae75999a462573fb4d376f8b1b22ef8842597f7a5e69cb2ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -205,8 +362,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf0607494bcee64a2eb443cb82e8c7c434fa273cf6096842b26944695a462119",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1214bbd780757bdc2e32e576717aefba77773942c2e63d511f6e1eea735cc437",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -285,10 +442,10 @@
             }
         }
     },
-    "callcodecallcode_11_d0g0v0_Frontier" : {
+    "callcodecallcode_11_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/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -299,19 +456,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x039455",
-                    "hash" : "0x2308682114729f63d2cbc2e5ff0aa86cf3bc3f1cd16ebe4c7c8ce9371e48c0ec",
-                    "mixHash" : "0x830dfde14d1a75fb64fd62ed6c6a66068d771e4c081e74e5a47089ec194b5f2b",
-                    "nonce" : "0x073f65d5678732d1",
+                    "gasUsed" : "0x03997d",
+                    "hash" : "0xabadd8c37c81357b0f00662d8fc4f029eb4e4c7a401f03ccd5e3efa4257baddc",
+                    "mixHash" : "0x67032d734822fcd2845f82fba79067ef4e65f651048879b478634a33e21c17b3",
+                    "nonce" : "0x1e9b292a49bcf800",
                     "number" : "0x01",
                     "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "0x0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
-                    "stateRoot" : "0xbae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169b",
+                    "receiptTrie" : "0x3bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090ad",
+                    "stateRoot" : "0x99c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a0830dfde14d1a75fb64fd62ed6c6a66068d771e4c081e74e5a47089ec194b5f2b88073f65d5678732d1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099c848bba3f970bd987b4bfd031061739cb6a21361b9fa300eebf5cab5394a1ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03bcbbbde13385ffdbeb4b3e38a68533c7bc5a907ad13764286d0c3c8dc2090adb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a067032d734822fcd2845f82fba79067ef4e65f651048879b478634a33e21c17b3881e9b292a49bcf800f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -348,8 +505,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2308682114729f63d2cbc2e5ff0aa86cf3bc3f1cd16ebe4c7c8ce9371e48c0ec",
-        "network" : "Frontier",
+        "lastblockhash" : "0xabadd8c37c81357b0f00662d8fc4f029eb4e4c7a401f03ccd5e3efa4257baddc",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -383,14 +540,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79455",
+                "balance" : "0x4563918244f7997d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606bab",
+                "balance" : "0x0de0b6b3a7606683",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -428,10 +585,10 @@
             }
         }
     },
-    "callcodecallcode_11_d0g0v0_Homestead" : {
+    "callcodecallcode_11_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/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -443,9 +600,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x039455",
-                    "hash" : "0xacc765dcfc67baac6f67ae2573921b9caf42eb903a035ff99b7b3205352bb649",
-                    "mixHash" : "0x8b0015e7b90b478b76932de7736a9c169b33e60161dc7129d079348e971e13c1",
-                    "nonce" : "0x2e6ad2ac9b3e83ac",
+                    "hash" : "0x0c18b4de00d9f5c3627f37a3f10eaaf710fb0aaaf2f6b33fb62d0e474d36e79e",
+                    "mixHash" : "0x10fdce5be2e3c34b9fdba3888c5b5b8953998408cb762a73bbf7c7a0363b92f3",
+                    "nonce" : "0x5423ff01de594043",
                     "number" : "0x01",
                     "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
                     "receiptTrie" : "0x0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
@@ -454,7 +611,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a08b0015e7b90b478b76932de7736a9c169b33e60161dc7129d079348e971e13c1882e6ad2ac9b3e83acf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a010fdce5be2e3c34b9fdba3888c5b5b8953998408cb762a73bbf7c7a0363b92f3885423ff01de594043f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -491,8 +648,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xacc765dcfc67baac6f67ae2573921b9caf42eb903a035ff99b7b3205352bb649",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0c18b4de00d9f5c3627f37a3f10eaaf710fb0aaaf2f6b33fb62d0e474d36e79e",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -571,10 +728,10 @@
             }
         }
     },
-    "callcodecallcode_11_d0g0v0_Metropolis" : {
+    "callcodecallcode_11_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/stCallCodes/callcodecallcode_11_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,19 +742,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03997d",
-                    "hash" : "0xef4c886da9bdb89e4dedeadf766151dcb14d0c9ce0b1c1bf69295961f3913353",
-                    "mixHash" : "0xe808a3dce69edb6ba1c63ec9fdec11c0a12b09de669d4f94cba75bcad2284ff6",
-                    "nonce" : "0xb9f9f1e088ca8aab",
+                    "gasUsed" : "0x039455",
+                    "hash" : "0x7cf294aa4cd04658a1d40b46687d4e1532176f986fef47b20271711914649b8d",
+                    "mixHash" : "0x35c436e7fb2e0b43b14d16017f5e26fbeb06481331360beb59c454aa0db94178",
+                    "nonce" : "0x95c076478fd9c316",
                     "number" : "0x01",
                     "parentHash" : "0x6d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010",
-                    "receiptTrie" : "0x607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03beb",
-                    "stateRoot" : "0x830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00",
+                    "receiptTrie" : "0x0f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17",
+                    "stateRoot" : "0xbae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830dcbd90668ce17bfda99a10e697d538b349915b6bdaac7d0fbdbf0a4ad9b00a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0607bd1ddb33992fe34ee90ea1b62f14882dd18a1ce8740a40ddf087337d03bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303997d8203e880a0e808a3dce69edb6ba1c63ec9fdec11c0a12b09de669d4f94cba75bcad2284ff688b9f9f1e088ca8aabf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06d0eb2dbed10de4c6085e038e3f0963cb85807259a0a753ef6bf9342c093c010a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bae9ee8e12b0a5c78538ffdd95f31cc4ad4df8eb7d7aedbc9642a1a505d6169ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00f22a1a25254fbd1a13cfe38033a8541b95e8ed5138db69a592d5bc9eb604b17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830394558203e880a035c436e7fb2e0b43b14d16017f5e26fbeb06481331360beb59c454aa0db941788895c076478fd9c316f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -634,16 +791,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0631b8d9ff47455a807d70c84ecebd418bedb62af1f88a7b497827c6605610420a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef4c886da9bdb89e4dedeadf766151dcb14d0c9ce0b1c1bf69295961f3913353",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7cf294aa4cd04658a1d40b46687d4e1532176f986fef47b20271711914649b8d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -676,14 +826,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7997d",
+                "balance" : "0x4563918244f79455",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7606683",
+                "balance" : "0x0de0b6b3a7606bab",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0.json
index cbe68b1e7..61454764a 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_110_OOGE_d0g0v0_EIP150" : {
+    "callcodecallcodecall_110_OOGE_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/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0xc23de353e0920df44bf5067719b2f9e3218b0d0d7b293b84ffe40336b51cbf36",
-                    "mixHash" : "0x55ee0c299400e239fb2400848b5af0742719bc16ebe76121f78078c6683c8a67",
-                    "nonce" : "0xb243627a7f289a43",
+                    "hash" : "0x15cc680de10bda01bafe7718629d81b65fcd7b7a3691cdf539ff55c67b47dd13",
+                    "mixHash" : "0x61b5b41b51ae42bb1d6fc206eee7c818114966565a437825b08568fdf457f6af",
+                    "nonce" : "0xf02b56d97aa10421",
                     "number" : "0x01",
                     "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "0x180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
-                    "stateRoot" : "0x10ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x2ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a055ee0c299400e239fb2400848b5af0742719bc16ebe76121f78078c6683c8a6788b243627a7f289a43f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a061b5b41b51ae42bb1d6fc206eee7c818114966565a437825b08568fdf457f6af88f02b56d97aa10421f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc23de353e0920df44bf5067719b2f9e3218b0d0d7b293b84ffe40336b51cbf36",
-        "network" : "EIP150",
+        "lastblockhash" : "0x15cc680de10bda01bafe7718629d81b65fcd7b7a3691cdf539ff55c67b47dd13",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGE_d0g0v0_EIP158" : {
+    "callcodecallcodecall_110_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x3b85ca2091eaa042dec697816f7a9c19cb7569c9209525e4a6e9130b44b17412",
+                    "mixHash" : "0xdb522c582ec606a91ebb745d9a6e397862ee6cae1168144b7bbb6ae6e0350756",
+                    "nonce" : "0x31d8cf29b686dc9c",
+                    "number" : "0x01",
+                    "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0x2ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0db522c582ec606a91ebb745d9a6e397862ee6cae1168144b7bbb6ae6e03507568831d8cf29b686dc9cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3b85ca2091eaa042dec697816f7a9c19cb7569c9209525e4a6e9130b44b17412",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_OOGE_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/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x7675ee175e32447c08f5c96aa1b73728e102050eafbfea320016cae112eeee68",
-                    "mixHash" : "0x9b42a1d148eb2762429a002cb5f00813c09b3e00e93383e737e5949da8dfaed5",
-                    "nonce" : "0x29c128aae40d1a58",
+                    "hash" : "0x978a5fd5da1e774ca0c6661e7a2615a3cae4038ddd51c33e937a43f1c770419f",
+                    "mixHash" : "0x5c3dd6e0f02771c6db4dd47da15fbac4b3b2eded2ae7a1a0333ec78dbde981d0",
+                    "nonce" : "0xbd29d3e1a12ea8af",
                     "number" : "0x01",
                     "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
                     "receiptTrie" : "0x180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a09b42a1d148eb2762429a002cb5f00813c09b3e00e93383e737e5949da8dfaed58829c128aae40d1a58f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a05c3dd6e0f02771c6db4dd47da15fbac4b3b2eded2ae7a1a0333ec78dbde981d088bd29d3e1a12ea8aff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7675ee175e32447c08f5c96aa1b73728e102050eafbfea320016cae112eeee68",
-        "network" : "EIP158",
+        "lastblockhash" : "0x978a5fd5da1e774ca0c6661e7a2615a3cae4038ddd51c33e937a43f1c770419f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGE_d0g0v0_Frontier" : {
+    "callcodecallcodecall_110_OOGE_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/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0xf836b1b51f346ca2a3f598bdc5a58df61b0507fcec3ca022a5269a5b626f074d",
-                    "mixHash" : "0x6ca4dad2d5b35dd701acccb576586d46092da050bfb32d6dce3a65d5c3b843c0",
-                    "nonce" : "0xcd26e689e76a2c62",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0xf48d150d7dacb0225b8e74056ef8f9564af123b7175444ddaa7bd5336e316004",
+                    "mixHash" : "0xa9eada262665ba245edf75505fed6d46311c7f5c4502e553f1decdddb908e610",
+                    "nonce" : "0xd0115d82d56778bb",
                     "number" : "0x01",
                     "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "0xf80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
-                    "stateRoot" : "0x01ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3",
+                    "receiptTrie" : "0x180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935",
+                    "stateRoot" : "0x10ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a06ca4dad2d5b35dd701acccb576586d46092da050bfb32d6dce3a65d5c3b843c088cd26e689e76a2c62f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010ad30f912d0e95159d347f1bbb0a956388a11fbda8888e57a4911abf630d6c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0180660d7653f49f1f50b53093faa6a0884872c4bb331da5b7885ac38ba75e935b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0a9eada262665ba245edf75505fed6d46311c7f5c4502e553f1decdddb908e61088d0115d82d56778bbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf836b1b51f346ca2a3f598bdc5a58df61b0507fcec3ca022a5269a5b626f074d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf48d150d7dacb0225b8e74056ef8f9564af123b7175444ddaa7bd5336e316004",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGE_d0g0v0_Homestead" : {
+    "callcodecallcodecall_110_OOGE_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/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0xe6d7921d0b8a5d0a1ac4dae42b45e9b43f3f6167b7df43030e391eb21ff265ef",
-                    "mixHash" : "0x38f1696a8b1bede4d7124c206bd5b6dab677a4b9be8c745851b42448ef1e65e5",
-                    "nonce" : "0xa43409a3352302fd",
+                    "hash" : "0x0c2a10ada1d20fd999c067a922d636176e18e79ddfb9877295f70e8b0de52d46",
+                    "mixHash" : "0x321de60ceb6c2c7e53057e25ea88679743a72126934b66e2176345f4e269d5a4",
+                    "nonce" : "0x69905b315d706d66",
                     "number" : "0x01",
                     "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
                     "receiptTrie" : "0xf80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a038f1696a8b1bede4d7124c206bd5b6dab677a4b9be8c745851b42448ef1e65e588a43409a3352302fdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0321de60ceb6c2c7e53057e25ea88679743a72126934b66e2176345f4e269d5a48869905b315d706d66f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6d7921d0b8a5d0a1ac4dae42b45e9b43f3f6167b7df43030e391eb21ff265ef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0c2a10ada1d20fd999c067a922d636176e18e79ddfb9877295f70e8b0de52d46",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGE_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_110_OOGE_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/stCallCodes/callcodecallcodecall_110_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0xc6041539a4388e823b744d33b7456058c6382fd771b15fb4337cd3e91032f9d5",
-                    "mixHash" : "0xe56031a123015d340a7ccc494f86e68aa1a5f3fac00e17f3c70916482067a164",
-                    "nonce" : "0x4ec0075ea7e635b7",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0xbbffa3cc963c84541693d7a3e9c566bac973e4e00c404c6b5156a41ea86fe94f",
+                    "mixHash" : "0x7d1a8b2b8506d1dc9891c3ddc0fe4bf38aaf35b3bf390d95f518710ebb63e050",
+                    "nonce" : "0x40badf0053856ad3",
                     "number" : "0x01",
                     "parentHash" : "0x4ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93c",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0x2ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499e",
+                    "receiptTrie" : "0xf80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03",
+                    "stateRoot" : "0x01ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ff35b6aeb7ec3224c68f11efc4da3095bd294e36d74b44200b5629dd9ee499ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0e56031a123015d340a7ccc494f86e68aa1a5f3fac00e17f3c70916482067a164884ec0075ea7e635b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04ad989a8c0dce81f1acd928b98b634dbd07f20fc905148231c705676af5cd93ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ee033afac0b8d9c31dab8cc2c8270f70845becc125f31ae3e752ae07720cb3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f80167bd10d523fe2d7ea36201d4f5858e441d88475685939b51d16ab3483b03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a07d1a8b2b8506d1dc9891c3ddc0fe4bf38aaf35b3bf390d95f518710ebb63e0508840badf0053856ad3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e9c685def9ab91b1769f936072a25e1ec626b60fe4b52bed82cc38fb7403aa6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6041539a4388e823b744d33b7456058c6382fd771b15fb4337cd3e91032f9d5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbbffa3cc963c84541693d7a3e9c566bac973e4e00c404c6b5156a41ea86fe94f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
index ae516bb4f..56aaac44b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_110_OOGMAfter_d0g0v0_EIP150" : {
+    "callcodecallcodecall_110_OOGMAfter_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/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x9a53892547d22b53019f685f36cd28170e0443ec372d28bd590419f72560c2be",
-                    "mixHash" : "0x6601078005c37261b7838541306193804118923bb5cd6f3e7e0bcf29eadcddd2",
-                    "nonce" : "0x6b7bdfef7958a7a1",
+                    "hash" : "0x49537c231bc8f89783b100743f5baa831da1829f8e9fafcd5146f42efa350153",
+                    "mixHash" : "0x5e071a0752ad5ba2d8c94c6dc7ea8d76331e1c5782d5bbffa8e02f90f21a9917",
+                    "nonce" : "0x82031adb335c3e3a",
                     "number" : "0x01",
                     "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
-                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a06601078005c37261b7838541306193804118923bb5cd6f3e7e0bcf29eadcddd2886b7bdfef7958a7a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a05e071a0752ad5ba2d8c94c6dc7ea8d76331e1c5782d5bbffa8e02f90f21a99178882031adb335c3e3af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a53892547d22b53019f685f36cd28170e0443ec372d28bd590419f72560c2be",
-        "network" : "EIP150",
+        "lastblockhash" : "0x49537c231bc8f89783b100743f5baa831da1829f8e9fafcd5146f42efa350153",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_d0g0v0_EIP158" : {
+    "callcodecallcodecall_110_OOGMAfter_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/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xe0fae8f0fd7701fc75480cae0affcb792f4b626aa56006efd39c8764a61a338d",
-                    "mixHash" : "0xfaf43470d029c0bfb92869ceaa8288c91d13d3a1ec2a89bf28716ff39a1f8d1a",
-                    "nonce" : "0x57823fe3813541f4",
+                    "hash" : "0x67665e58604e1a4a97b7227e9f0b04206422c77da6445f44838f39c599899a49",
+                    "mixHash" : "0xe88ccdea116c72dbd96718f3f028a289c0e03b2b79607c6b471b4aa9f2bf4402",
+                    "nonce" : "0x99a849538a0581b0",
+                    "number" : "0x01",
+                    "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0e88ccdea116c72dbd96718f3f028a289c0e03b2b79607c6b471b4aa9f2bf44028899a849538a0581b0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67665e58604e1a4a97b7227e9f0b04206422c77da6445f44838f39c599899a49",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x52878f826cae256a294334e77b0666887a0d54b82a328c9ede15c6706dd47086",
+                    "mixHash" : "0xec89f965fea4225e058d0401cea5de50f1bdee11265dfde41164cbe5b69339e1",
+                    "nonce" : "0x2ef1f1b0df46aef0",
                     "number" : "0x01",
                     "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
                     "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0faf43470d029c0bfb92869ceaa8288c91d13d3a1ec2a89bf28716ff39a1f8d1a8857823fe3813541f4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0ec89f965fea4225e058d0401cea5de50f1bdee11265dfde41164cbe5b69339e1882ef1f1b0df46aef0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0fae8f0fd7701fc75480cae0affcb792f4b626aa56006efd39c8764a61a338d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x52878f826cae256a294334e77b0666887a0d54b82a328c9ede15c6706dd47086",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_d0g0v0_Frontier" : {
+    "callcodecallcodecall_110_OOGMAfter_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/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x19f6d010ba497dc4de6f4b94d9da8d7883694a682a8b04b748dcaa69fcbc5ac2",
-                    "mixHash" : "0x8c53ec4ecdf92ca2f9e4560d7f0ab2a43717a3c0fbc0034ee3d37e34b0bc69fc",
-                    "nonce" : "0xa226f26e78827f3d",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x085b8a0668b8ff3deae533c3753080d3c2d1d36e4ab34bfd37a3ce0dd2afe619",
+                    "mixHash" : "0xcd42121ecb62cee752b354ff10ad0c27322ac4d93779dcf6f9fec4baefca6781",
+                    "nonce" : "0x53f6c6ce72acd0df",
                     "number" : "0x01",
                     "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
-                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
+                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
+                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a08c53ec4ecdf92ca2f9e4560d7f0ab2a43717a3c0fbc0034ee3d37e34b0bc69fc88a226f26e78827f3df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0cd42121ecb62cee752b354ff10ad0c27322ac4d93779dcf6f9fec4baefca67818853f6c6ce72acd0dff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x19f6d010ba497dc4de6f4b94d9da8d7883694a682a8b04b748dcaa69fcbc5ac2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x085b8a0668b8ff3deae533c3753080d3c2d1d36e4ab34bfd37a3ce0dd2afe619",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_d0g0v0_Homestead" : {
+    "callcodecallcodecall_110_OOGMAfter_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/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x3fbdda5fe463bd1330c329c6aee871b8ef6891b365930c427f80610cf2eb9c06",
-                    "mixHash" : "0x9e105bbca05fcc09217e1beabe67541bb7c74fca7fc4a029bec3bbf73adf1be4",
-                    "nonce" : "0xbc71c52fcb57ebbd",
+                    "hash" : "0x6a552e8b63190fc4774ceb44f099c7f36e33cee15c1775a4452352baf4ddf240",
+                    "mixHash" : "0x40f784f1be466d89ff91caf6ae5ef1ceff53b2417af05d6ac977e598ee274d1b",
+                    "nonce" : "0xf68c4da383efc236",
                     "number" : "0x01",
                     "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
                     "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a09e105bbca05fcc09217e1beabe67541bb7c74fca7fc4a029bec3bbf73adf1be488bc71c52fcb57ebbdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a040f784f1be466d89ff91caf6ae5ef1ceff53b2417af05d6ac977e598ee274d1b88f68c4da383efc236f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3fbdda5fe463bd1330c329c6aee871b8ef6891b365930c427f80610cf2eb9c06",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6a552e8b63190fc4774ceb44f099c7f36e33cee15c1775a4452352baf4ddf240",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_110_OOGMAfter_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/stCallCodes/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x46d54e1b0554211e6b82674e55edb1eba569fd734d50d99261a462f31f26cd11",
-                    "mixHash" : "0xbb466fbf770348acbb7e7b627dfc79ad3694e022f15dc606daf5a4fc66e91542",
-                    "nonce" : "0xa504901abc8c67ef",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x0e1a3061c2bdc78aaf5859d537e116d36d03bb295ee3997b533602d725fc8b9e",
+                    "mixHash" : "0xc391dd4aee7d106938f940558fe579034f413670fa2134829cf26130a962dad4",
+                    "nonce" : "0xcbe04dd986b465b5",
                     "number" : "0x01",
                     "parentHash" : "0x90a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0x399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effb",
+                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
+                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0bb466fbf770348acbb7e7b627dfc79ad3694e022f15dc606daf5a4fc66e9154288a504901abc8c67eff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a090a213d483b4a5925e3f4b05409f2f3c683b178dbb809852f53485246783c810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c391dd4aee7d106938f940558fe579034f413670fa2134829cf26130a962dad488cbe04dd986b465b5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46d54e1b0554211e6b82674e55edb1eba569fd734d50d99261a462f31f26cd11",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0e1a3061c2bdc78aaf5859d537e116d36d03bb295ee3997b533602d725fc8b9e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
index f91c75e1a..fe8d47677 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_110_OOGMBefore_d0g0v0_EIP150" : {
+    "callcodecallcodecall_110_OOGMBefore_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/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xdf9e533bb6722fd893a56037e4188ef35a1e06d0d01b14d3a239fd21ceedb2de",
-                    "mixHash" : "0xbbec3d477698014719f61240192ca8e6cfadd8c430b645c490bb8520317a8ae0",
-                    "nonce" : "0x47b2b778aeefdf4b",
+                    "hash" : "0x1f076aa7b0d3cdf86197170bc4190ff3e46a5135d45adc9f2f7bea18926f524c",
+                    "mixHash" : "0xcc057789e0c6d30215c72306e1476d5a0a7994358715a172ee0006e2cc0c4fd7",
+                    "nonce" : "0x662d00d5d958737d",
                     "number" : "0x01",
                     "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "0xfdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
-                    "stateRoot" : "0x06402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bb",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x3492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0bbec3d477698014719f61240192ca8e6cfadd8c430b645c490bb8520317a8ae08847b2b778aeefdf4bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0cc057789e0c6d30215c72306e1476d5a0a7994358715a172ee0006e2cc0c4fd788662d00d5d958737df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf9e533bb6722fd893a56037e4188ef35a1e06d0d01b14d3a239fd21ceedb2de",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1f076aa7b0d3cdf86197170bc4190ff3e46a5135d45adc9f2f7bea18926f524c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMBefore_d0g0v0_EIP158" : {
+    "callcodecallcodecall_110_OOGMBefore_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/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0xe1517e2ae36ca2fbd746aaa9c179cc012021a6ab82fc8f749e5d0b3e2c9dd178",
-                    "mixHash" : "0x856856a3c00cbec630be34d04b2ea4ddb759699be6f1b1c44d35d6968c8a8c9f",
-                    "nonce" : "0xc58cedb5c0089884",
+                    "hash" : "0xe6c081b8e3f09d67e2c95a8a4d6c4d980f6b3d05568a117af5a693033d7d7083",
+                    "mixHash" : "0x16985ab6e2436b1bdee86a269d953095fa8501d5bffa397cae137c617d7241d6",
+                    "nonce" : "0x6a945f7520e81374",
+                    "number" : "0x01",
+                    "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0x3492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a016985ab6e2436b1bdee86a269d953095fa8501d5bffa397cae137c617d7241d6886a945f7520e81374f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79ac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe6c081b8e3f09d67e2c95a8a4d6c4d980f6b3d05568a117af5a693033d7d7083",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xd60dd82cbab7c582700f5aec713cb7b37c55588562fed3d2ada6658912ff300d",
+                    "mixHash" : "0xf45d24319eff1ffee21365e7a2fc562ce7f9780037700c4f5d825a42cca2069b",
+                    "nonce" : "0x4f0a128393e6979d",
                     "number" : "0x01",
                     "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
                     "receiptTrie" : "0xfdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0856856a3c00cbec630be34d04b2ea4ddb759699be6f1b1c44d35d6968c8a8c9f88c58cedb5c0089884f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0f45d24319eff1ffee21365e7a2fc562ce7f9780037700c4f5d825a42cca2069b884f0a128393e6979df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1517e2ae36ca2fbd746aaa9c179cc012021a6ab82fc8f749e5d0b3e2c9dd178",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd60dd82cbab7c582700f5aec713cb7b37c55588562fed3d2ada6658912ff300d",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMBefore_d0g0v0_Frontier" : {
+    "callcodecallcodecall_110_OOGMBefore_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/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x531a3166a793c91351e0e5516b6225bedf99618ed252e10fb36ebd5cf6f4fc2c",
-                    "mixHash" : "0x09b264b134f9587d2f268b8af6ecedc129954c0c8544e360a21c06056bd26750",
-                    "nonce" : "0xc60dc699caaa094f",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xe37e337b7f0d8cacae1ad190ab6848daefdabfacca3f895934ec9dc6ca9dada9",
+                    "mixHash" : "0xeaddcc8e52c6b84bed8337ef6728547cbb8457ba09b7f32068e633ec5a2b3ce7",
+                    "nonce" : "0xe5b4c1fbdf04d8ef",
                     "number" : "0x01",
                     "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "0xce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
-                    "stateRoot" : "0xb49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2",
+                    "receiptTrie" : "0xfdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1",
+                    "stateRoot" : "0x06402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a009b264b134f9587d2f268b8af6ecedc129954c0c8544e360a21c06056bd2675088c60dc699caaa094ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006402aae3729f709aa965ff8ee6418db56c27f88dff8dfc8209bb8e3d52dc5bba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fdc5781ddfd606983de8508dd00d2dc40389eaaeedca182bd6fd930065ca94a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0eaddcc8e52c6b84bed8337ef6728547cbb8457ba09b7f32068e633ec5a2b3ce788e5b4c1fbdf04d8eff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x531a3166a793c91351e0e5516b6225bedf99618ed252e10fb36ebd5cf6f4fc2c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe37e337b7f0d8cacae1ad190ab6848daefdabfacca3f895934ec9dc6ca9dada9",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMBefore_d0g0v0_Homestead" : {
+    "callcodecallcodecall_110_OOGMBefore_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/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x74cde843275589515ec916a0a2904f8e1015fc383fd4ba32150b07a714e3a84d",
-                    "mixHash" : "0xc43419b72e1f41510c8cd84b20a134259842bdbba2887e271b3396774b568f5d",
-                    "nonce" : "0xdb817d4ae77a9b9a",
+                    "hash" : "0x7c45ee6b56b14eaa330c865c163fa7626e379675a61bb77c155186d11eef38af",
+                    "mixHash" : "0xb36e785c191d9efb8750f8de56e9ab162d5473bee5d55f6765a2e1c0236a7e9c",
+                    "nonce" : "0x5ff399ef25e7d1ba",
                     "number" : "0x01",
                     "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
                     "receiptTrie" : "0xce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c43419b72e1f41510c8cd84b20a134259842bdbba2887e271b3396774b568f5d88db817d4ae77a9b9af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0b36e785c191d9efb8750f8de56e9ab162d5473bee5d55f6765a2e1c0236a7e9c885ff399ef25e7d1baf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74cde843275589515ec916a0a2904f8e1015fc383fd4ba32150b07a714e3a84d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7c45ee6b56b14eaa330c865c163fa7626e379675a61bb77c155186d11eef38af",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_110_OOGMBefore_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/stCallCodes/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0xfccb11655bfd985c8a279d98882b15369d2699cb1906e09b43fc7f040e1036d3",
-                    "mixHash" : "0xf939f36383c1ee52e8bd88135b1132bcdf2e736de8ea1b366e34b73a26f4574e",
-                    "nonce" : "0x3105f0dbbf291760",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0x398d429a11fecce111d8e0d4f682864f7178536ecf55e874eedbdfced6c942f9",
+                    "mixHash" : "0x4546ec24171627f281d577458c25bf47b5f4900ab9a9b8465e9d6e978a6d2319",
+                    "nonce" : "0xa6ea354c30728767",
                     "number" : "0x01",
                     "parentHash" : "0x61e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0x3492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3e",
+                    "receiptTrie" : "0xce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139",
+                    "stateRoot" : "0xb49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03492b384d17f6555792baaf5ee7d937b9bd2034e27492007de588f6b60b1ca3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0f939f36383c1ee52e8bd88135b1132bcdf2e736de8ea1b366e34b73a26f4574e883105f0dbbf291760f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a061e9e6e3b5214b1867b93fdf7433336298a5f668e94d1cf5e5bef304f7cefc15a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b49add2eb95fae1a344a76235c17d6e02a644e758bb0c6edb18a54c4edb9d2e2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ce7c04a999bb55c66f8164d001e37541e30340058067bfcb2740c81cb3a9b139b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a04546ec24171627f281d577458c25bf47b5f4900ab9a9b8465e9d6e978a6d231988a6ea354c30728767f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05162cd5d9ce8f88f7ce1141b5a9f2185df82989a73f1b9dc7403b476485e79aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfccb11655bfd985c8a279d98882b15369d2699cb1906e09b43fc7f040e1036d3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x398d429a11fecce111d8e0d4f682864f7178536ecf55e874eedbdfced6c942f9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
index e6ca8682b..ee8a56359 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_110_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecallcodecall_110_SuicideEnd_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/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0x18f6f96b754d650393674d1d77123150d48be326f31e5b1aef61bccb37386993",
-                    "mixHash" : "0x1829b1b52b382646feac45e42d86cee79acc9f53ed44c1d4c046a7988008cdc1",
-                    "nonce" : "0xa1e1882570db3042",
+                    "hash" : "0x3ac2ead53638c5b231fa2e039b6d59174777b8685a48c981d438153828cfb476",
+                    "mixHash" : "0x8761f61a1f9f5193fcf4ffec6325f7c639e683a81cb588551268d7dffcdcfceb",
+                    "nonce" : "0xa88c2dfe43f5158a",
                     "number" : "0x01",
                     "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "0x7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
-                    "stateRoot" : "0x814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a01829b1b52b382646feac45e42d86cee79acc9f53ed44c1d4c046a7988008cdc188a1e1882570db3042f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a08761f61a1f9f5193fcf4ffec6325f7c639e683a81cb588551268d7dffcdcfceb88a88c2dfe43f5158af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18f6f96b754d650393674d1d77123150d48be326f31e5b1aef61bccb37386993",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3ac2ead53638c5b231fa2e039b6d59174777b8685a48c981d438153828cfb476",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -140,10 +147,158 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecallcodecall_110_SuicideEnd_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0xe6e648f06029d0f32c41c561e73688f17d29bdba8f8449ea0833fab469654b33",
+                    "mixHash" : "0x39aa60587fcc50d54d1c8569d2a92f9dede30e8b826228f40c2c96537497906f",
+                    "nonce" : "0xf905096cab16a063",
+                    "number" : "0x01",
+                    "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a039aa60587fcc50d54d1c8569d2a92f9dede30e8b826228f40c2c96537497906f88f905096cab16a063f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe6e648f06029d0f32c41c561e73688f17d29bdba8f8449ea0833fab469654b33",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_SuicideEnd_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/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -155,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xb7179d3d4864657f0440a61e43974273a6240ae5860091fa989a3b2a3555723c",
-                    "mixHash" : "0x9114feebdcec024466918349b5f971559c12f5d4ff3093ff1e4fe3d2a48dd0a7",
-                    "nonce" : "0x3a4ad20939a8d4de",
+                    "hash" : "0x45d2a9dafd9810cd3fa91de78ff8a676283e1363b933cd36da88e6de7d9d498a",
+                    "mixHash" : "0x376228a4d27c7284d5cd986baeaa9c7d506da8938f9da1660d47f99f56059d37",
+                    "nonce" : "0x552a067bcb435841",
                     "number" : "0x01",
                     "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
                     "receiptTrie" : "0x7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
@@ -166,7 +321,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a09114feebdcec024466918349b5f971559c12f5d4ff3093ff1e4fe3d2a48dd0a7883a4ad20939a8d4def862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0376228a4d27c7284d5cd986baeaa9c7d506da8938f9da1660d47f99f56059d3788552a067bcb435841f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -203,8 +358,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7179d3d4864657f0440a61e43974273a6240ae5860091fa989a3b2a3555723c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x45d2a9dafd9810cd3fa91de78ff8a676283e1363b933cd36da88e6de7d9d498a",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -281,10 +436,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecallcodecall_110_SuicideEnd_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/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -295,19 +450,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0x6357478487c348c03ddb7064e4a0559b0e8e0ea67fff0cf977ecf680d9a1568c",
-                    "mixHash" : "0xdea624a95a82f10a1632b46ece2ab245daffe591b1a7ba29da9e3cc489132de7",
-                    "nonce" : "0x775092def9af3c22",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x1e02b3fc61bd05d4a42feae6c9a121ebab04038c0ef000379b59c7ce95c236a8",
+                    "mixHash" : "0x6626250a039abf1cb87d7f346df57812aab3a0cdd8b54cc0effa3eb2446d4b14",
+                    "nonce" : "0xfede4be3dce8542c",
                     "number" : "0x01",
                     "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "0x148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
-                    "stateRoot" : "0x24f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8",
+                    "receiptTrie" : "0x7d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67",
+                    "stateRoot" : "0x814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0dea624a95a82f10a1632b46ece2ab245daffe591b1a7ba29da9e3cc489132de788775092def9af3c22f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814641ffdd9899e2380df067baf35c87e5ddce3597b5804421801392f5a11cf5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d8d902db12b9f036c1e786d7617a5662b591cba0f7592f921e53df1ab092c67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a06626250a039abf1cb87d7f346df57812aab3a0cdd8b54cc0effa3eb2446d4b1488fede4be3dce8542cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,8 +499,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6357478487c348c03ddb7064e4a0559b0e8e0ea67fff0cf977ecf680d9a1568c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1e02b3fc61bd05d4a42feae6c9a121ebab04038c0ef000379b59c7ce95c236a8",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -370,14 +525,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -422,10 +577,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecallcodecall_110_SuicideEnd_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/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,9 +592,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0xeb26c9fd58c73821097bf02143f550677598aee3812a4687792be84549cbb988",
-                    "mixHash" : "0xd18216b9c369b754091592342d175e6c912808abb8eb56751ea5cc715f44d1f7",
-                    "nonce" : "0x97abfb86a254548c",
+                    "hash" : "0xd268acf2369d49dc3066313650609f35d89fd0c7ec7ce8556477b9e060bb4a47",
+                    "mixHash" : "0x498728e2d458bfb4f40dc2ac27ad92dffe43f7913cc04b96accef8d60df28a9e",
+                    "nonce" : "0x48e820cb83e6c19b",
                     "number" : "0x01",
                     "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
                     "receiptTrie" : "0x148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
@@ -448,7 +603,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d18216b9c369b754091592342d175e6c912808abb8eb56751ea5cc715f44d1f78897abfb86a254548cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0498728e2d458bfb4f40dc2ac27ad92dffe43f7913cc04b96accef8d60df28a9e8848e820cb83e6c19bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -485,8 +640,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb26c9fd58c73821097bf02143f550677598aee3812a4687792be84549cbb988",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd268acf2369d49dc3066313650609f35d89fd0c7ec7ce8556477b9e060bb4a47",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -563,10 +718,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_110_SuicideEnd_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/stCallCodes/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -577,19 +732,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x7df43a3d8d8e93f501493fb9ca8bea6e9bed919ee8a3e2a39d4fe62faf975044",
-                    "mixHash" : "0xac01dd0f75bc1ce41dd95f157ca6559ee85e2b56c8a9659428fb1369557548e9",
-                    "nonce" : "0x9a430a00461a86d3",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0x3b0b90b66548bc27e11d5d64a8ffb77567334d3c37f967a8bf2b21f64a7afc61",
+                    "mixHash" : "0x8048f872eb23da4619cf82ae88ef103683c356aa0674de35042fa1f233de9464",
+                    "nonce" : "0xde9b2de2c393ac7e",
                     "number" : "0x01",
                     "parentHash" : "0x2fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0xffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14",
+                    "receiptTrie" : "0x148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7",
+                    "stateRoot" : "0x24f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffbc83c6d750816c9acb6e8a472a7402a91dc29d2e74c32037b4c615840d6e14a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a0ac01dd0f75bc1ce41dd95f157ca6559ee85e2b56c8a9659428fb1369557548e9889a430a00461a86d3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a02fb7c2b07cca99242fc065e88e5345362dbbfc439e342497c36569c62c799732a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f1562213397304f68b1d1991e7cf8e91cde71a9ead42f50eefe7ddafbb73c8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0148d2a83b8b1036884dd5a501b9633945191cd326770d3ecd974364f7137c6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a08048f872eb23da4619cf82ae88ef103683c356aa0674de35042fa1f233de946488de9b2de2c393ac7ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,16 +781,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b5b492d8fadcff6d91722bd79ff037ebd176b0bae2260cee56c2da8bdbed28ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7df43a3d8d8e93f501493fb9ca8bea6e9bed919ee8a3e2a39d4fe62faf975044",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3b0b90b66548bc27e11d5d64a8ffb77567334d3c37f967a8bf2b21f64a7afc61",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -659,14 +807,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
index 556a6228b..07f7a818c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcodecallcodecall_110_SuicideMiddle_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/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xb521d2be2b5125647cf455147dc24f17310a5f101323d894507104c64994cb7b",
-                    "mixHash" : "0x40c66e295a5776b89b0c2f4fa91cdda0e78a1b0240fe03b6362c8df4c0f6f56f",
-                    "nonce" : "0x64bc0ca4c48a9116",
+                    "hash" : "0x39c50d5c62088c060f1fdf75935747ef6c28b0c8759f9852a46d8d8ee9934ffb",
+                    "mixHash" : "0x001a691d894891290409e431404dd2716e742dc8921a3debb8dfb654a8d430c3",
+                    "nonce" : "0x024366b6298760a0",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
-                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a040c66e295a5776b89b0c2f4fa91cdda0e78a1b0240fe03b6362c8df4c0f6f56f8864bc0ca4c48a9116f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0001a691d894891290409e431404dd2716e742dc8921a3debb8dfb654a8d430c388024366b6298760a0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb521d2be2b5125647cf455147dc24f17310a5f101323d894507104c64994cb7b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x39c50d5c62088c060f1fdf75935747ef6c28b0c8759f9852a46d8d8ee9934ffb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -139,10 +146,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcodecallcodecall_110_SuicideMiddle_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/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -154,9 +161,156 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x2e711e4b77da29ef5335394535dfff1a9506eff4146bc010b7c766bf14c29110",
-                    "mixHash" : "0x618d6fb1ac3231e46206925f0c06645b4ea1eb26091ad62a68ea8e1a138451eb",
-                    "nonce" : "0x9e2f0e4e63c4823b",
+                    "hash" : "0x75029514d23a5b5e3d95d2d1a233e0ec047ce98edbca48064375466ef7132bd7",
+                    "mixHash" : "0x8fb475fbaeb73224f815308a53b9b6793949eac404574b7909de4399d332eaa5",
+                    "nonce" : "0x55eb294d959cd295",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a08fb475fbaeb73224f815308a53b9b6793949eac404574b7909de4399d332eaa58855eb294d959cd295f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x75029514d23a5b5e3d95d2d1a233e0ec047ce98edbca48064375466ef7132bd7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x81045235b10c3cb668f6b13f705734d899bc9578c25e1db7c02811de40b67dde",
+                    "mixHash" : "0xc47faa7623def290efe7536b2b1d5c62f4194af52454f79de05361433195ad01",
+                    "nonce" : "0x28ae69976dbb73ac",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
                     "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
@@ -165,7 +319,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0618d6fb1ac3231e46206925f0c06645b4ea1eb26091ad62a68ea8e1a138451eb889e2f0e4e63c4823bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0c47faa7623def290efe7536b2b1d5c62f4194af52454f79de05361433195ad018828ae69976dbb73acf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -202,8 +356,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e711e4b77da29ef5335394535dfff1a9506eff4146bc010b7c766bf14c29110",
-        "network" : "EIP158",
+        "lastblockhash" : "0x81045235b10c3cb668f6b13f705734d899bc9578c25e1db7c02811de40b67dde",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -279,10 +433,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcodecallcodecall_110_SuicideMiddle_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/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -293,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xb2bd61c9f29950e2ca27ae027bc6e4bf6ab6039f515ee6d75880c1ea5d78fb84",
-                    "mixHash" : "0x2e1851d9018d472bf46e4ef92c0ce8c4732590127920a5c6b53a06c31140df59",
-                    "nonce" : "0xe740067b2c991537",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xea8bb755d83a721f0fe754c4e9c651ae514623c5c73ceee7e1a18ea6ce92d3e0",
+                    "mixHash" : "0x21b55447cfd56942cb30369f118b6e1ea6e4aaabc961ba9c9fa8a80716d8462c",
+                    "nonce" : "0xbe5d226ca49eb192",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
-                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
+                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a02e1851d9018d472bf46e4ef92c0ce8c4732590127920a5c6b53a06c31140df5988e740067b2c991537f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a021b55447cfd56942cb30369f118b6e1ea6e4aaabc961ba9c9fa8a80716d8462c88be5d226ca49eb192f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -342,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2bd61c9f29950e2ca27ae027bc6e4bf6ab6039f515ee6d75880c1ea5d78fb84",
-        "network" : "Frontier",
+        "lastblockhash" : "0xea8bb755d83a721f0fe754c4e9c651ae514623c5c73ceee7e1a18ea6ce92d3e0",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -367,14 +521,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +573,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcodecallcodecall_110_SuicideMiddle_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/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,9 +588,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0xb15e39545d5c67b5773d72929cc130b2a7eb5d15ec0f6fdf972a237442bb4b6e",
-                    "mixHash" : "0x9fc4b4e6200b56a59175045b1528e89caaef86b3f4bf5151b856fb273d78d3e2",
-                    "nonce" : "0xf826a8498954b76a",
+                    "hash" : "0x590587ee3030c88a01f857d9d2adfc385441b7e28d2b5791d91d29a6cadd4e8c",
+                    "mixHash" : "0x64cda6b313dbbbc4cfe50c7f0559b17d7d4e01186afd895f05d6f5bf2b2fb55a",
+                    "nonce" : "0xf34c9cc6ad51b1c2",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
                     "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
@@ -445,7 +599,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a09fc4b4e6200b56a59175045b1528e89caaef86b3f4bf5151b856fb273d78d3e288f826a8498954b76af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a064cda6b313dbbbc4cfe50c7f0559b17d7d4e01186afd895f05d6f5bf2b2fb55a88f34c9cc6ad51b1c2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,8 +636,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb15e39545d5c67b5773d72929cc130b2a7eb5d15ec0f6fdf972a237442bb4b6e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x590587ee3030c88a01f857d9d2adfc385441b7e28d2b5791d91d29a6cadd4e8c",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -559,10 +713,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_110_SuicideMiddle_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/stCallCodes/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -573,19 +727,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x75921d39bf59b8853527ad3fb2b13d0c4ad5066e449154e7d5432add6b07e52e",
-                    "mixHash" : "0xd3bddd5ec9c17f7c338d1adf8392ff8c1195c655829b276a60faf0503ebf423e",
-                    "nonce" : "0xf72e71772ce1a9cd",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xc9fd170af8b65b65468603306e311143ced2848fc6fb48e598a030a4e83f7c3c",
+                    "mixHash" : "0xcfc7c46552f07878934e0a07100006e5f0bdc8f3cea3f2ddd005cb57c19e86f7",
+                    "nonce" : "0x254af1ae8822e4f6",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
+                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d3bddd5ec9c17f7c338d1adf8392ff8c1195c655829b276a60faf0503ebf423e88f72e71772ce1a9cdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0cfc7c46552f07878934e0a07100006e5f0bdc8f3cea3f2ddd005cb57c19e86f788254af1ae8822e4f6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -622,16 +776,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75921d39bf59b8853527ad3fb2b13d0c4ad5066e449154e7d5432add6b07e52e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc9fd170af8b65b65468603306e311143ced2848fc6fb48e598a030a4e83f7c3c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -654,14 +801,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_d0g0v0.json
index 871c4fe3e..32003df16 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_110_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_110_d0g0v0_EIP150" : {
+    "callcodecallcodecall_110_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/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x8ce2fed0411b73fd4e0f91f78da107bcca4ba0f75947792f65de1e81baeb949a",
-                    "mixHash" : "0xcad782471ac7106f61c22a4ce66b662a0bc223d54399a6d98cea95be4494dcfd",
-                    "nonce" : "0x36d143308f6a008e",
+                    "hash" : "0x050c2034064a333a6f74ba38c3f0d192c22745f52055a2dbdfb871e7d0f0a6eb",
+                    "mixHash" : "0x7ceb3c25249dc809f0318a3d0a82dcc286eb5173075707f4810ffb41d567e534",
+                    "nonce" : "0xcaa2cd9044959696",
                     "number" : "0x01",
                     "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "0x0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
-                    "stateRoot" : "0xaaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48a",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x4fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0cad782471ac7106f61c22a4ce66b662a0bc223d54399a6d98cea95be4494dcfd8836d143308f6a008ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a07ceb3c25249dc809f0318a3d0a82dcc286eb5173075707f4810ffb41d567e53488caa2cd9044959696f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ce2fed0411b73fd4e0f91f78da107bcca4ba0f75947792f65de1e81baeb949a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x050c2034064a333a6f74ba38c3f0d192c22745f52055a2dbdfb871e7d0f0a6eb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_d0g0v0_EIP158" : {
+    "callcodecallcodecall_110_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/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x8c20183a0ade4bb47fc3f1fa7dafaad02fa1ff39d33150ada85095f8d80eb660",
-                    "mixHash" : "0xc9ceb67eb02942b22afee1e45747a81367e3ad11d801bce8184b33a44272a6ac",
-                    "nonce" : "0x709c9c2a0d9730d5",
+                    "hash" : "0xb9d38673e5fa22c9f64248eed05f2f510875fcb77096a4c51da7d823efc4c4a1",
+                    "mixHash" : "0x80cf88e3ff49d305fcee31557e1864214f02ab9c6f429f7e9c02743c52dfb725",
+                    "nonce" : "0xd538c2a16fa254e9",
+                    "number" : "0x01",
+                    "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x4fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a080cf88e3ff49d305fcee31557e1864214f02ab9c6f429f7e9c02743c52dfb72588d538c2a16fa254e9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbda",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb9d38673e5fa22c9f64248eed05f2f510875fcb77096a4c51da7d823efc4c4a1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763fffd",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x03",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x014a" : "0x1000000000000000000000000000000000000003",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000000",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x6886f76e23638664d642a9ae259f0452eb5949076b3e83384c7355e3aceb41e4",
+                    "mixHash" : "0xc35c5e01c7d7aa23a65e39c7de8ff149b51bb1b6223075144df2fc316a37104b",
+                    "nonce" : "0x89adf64516bed0fc",
                     "number" : "0x01",
                     "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
                     "receiptTrie" : "0x0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c9ceb67eb02942b22afee1e45747a81367e3ad11d801bce8184b33a44272a6ac88709c9c2a0d9730d5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c35c5e01c7d7aa23a65e39c7de8ff149b51bb1b6223075144df2fc316a37104b8889adf64516bed0fcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c20183a0ade4bb47fc3f1fa7dafaad02fa1ff39d33150ada85095f8d80eb660",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6886f76e23638664d642a9ae259f0452eb5949076b3e83384c7355e3aceb41e4",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_d0g0v0_Frontier" : {
+    "callcodecallcodecall_110_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/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0xebdf06af4d9ff633e2afb94e292318acd753ce8112d3a812b67fa612d1cbc9d3",
-                    "mixHash" : "0xedc0055f8785a2325a40533e40cd663dcfd1d5a7c9fcbe38cdd588c003841624",
-                    "nonce" : "0x1aac2f92c4a24076",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xd3516563d9dddc03cc460124595a8fdf4b13d0b9d1c2d18fb2d55e6a1535d470",
+                    "mixHash" : "0x108049411dcdc3bb9f7309ee8058bca2bf4dc9e929dbe0d6130e8411a2f64ef0",
+                    "nonce" : "0xcb781af2807ac57f",
                     "number" : "0x01",
                     "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "0x2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
-                    "stateRoot" : "0x73db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030ac",
+                    "receiptTrie" : "0x0533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7",
+                    "stateRoot" : "0xaaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0edc0055f8785a2325a40533e40cd663dcfd1d5a7c9fcbe38cdd588c003841624881aac2f92c4a24076f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aaa37836fac4cc48dbf79a1f5f295d6fabdc5594917a37a3ce2de697f3a1b48aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00533c8522bcff14998731d57b85f717ca7323c79cd4623e9f373583e26d3a9a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0108049411dcdc3bb9f7309ee8058bca2bf4dc9e929dbe0d6130e8411a2f64ef088cb781af2807ac57ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xebdf06af4d9ff633e2afb94e292318acd753ce8112d3a812b67fa612d1cbc9d3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd3516563d9dddc03cc460124595a8fdf4b13d0b9d1c2d18fb2d55e6a1535d470",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_d0g0v0_Homestead" : {
+    "callcodecallcodecall_110_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/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0x57b14a0af1b5ba03d43eeb45051a4f719e6980a5e7cd90c10eba5fde6cf12f91",
-                    "mixHash" : "0xe941b46682e7c792dbba01e56fe9c07baaaf6c182e5f7c9a6955f783fb471743",
-                    "nonce" : "0x8245f6b2c386e99a",
+                    "hash" : "0x29e2184baf6692eb9e9cd812a3e7280d313d3d8a3d1755f5b00aeb38d25e1344",
+                    "mixHash" : "0x231f14b82904f1d13d2195b62ac8965be6b688fdb61c6158acbd2c198945ece1",
+                    "nonce" : "0x6c3e584457d8e62a",
                     "number" : "0x01",
                     "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
                     "receiptTrie" : "0x2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0e941b46682e7c792dbba01e56fe9c07baaaf6c182e5f7c9a6955f783fb471743888245f6b2c386e99af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0231f14b82904f1d13d2195b62ac8965be6b688fdb61c6158acbd2c198945ece1886c3e584457d8e62af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57b14a0af1b5ba03d43eeb45051a4f719e6980a5e7cd90c10eba5fde6cf12f91",
-        "network" : "Homestead",
+        "lastblockhash" : "0x29e2184baf6692eb9e9cd812a3e7280d313d3d8a3d1755f5b00aeb38d25e1344",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcodecallcodecall_110_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_110_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/stCallCodes/callcodecallcodecall_110_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0x6ff11e5187e5e2330ac06e7730534bb4595b3637570fd56405afb7ac8451bab1",
-                    "mixHash" : "0x54c101c7f12d5d417b289e89af28536fa35a7fb4e3801fe7442cad2e871c2beb",
-                    "nonce" : "0x6f1be6e9657e775f",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0xcf42935890130f1a0e068d1f949bfd18781cc0e8dad147c525127ba2ec7247ea",
+                    "mixHash" : "0x64b6c115ddd52d3cf0a07f3f4fdb8990600d6148bfb1a1d4193d0c03ca0e139e",
+                    "nonce" : "0x4ff0084dbe2ca8dc",
                     "number" : "0x01",
                     "parentHash" : "0xc3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47ab",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0x4fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1",
+                    "receiptTrie" : "0x2a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2d",
+                    "stateRoot" : "0x73db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fffd34e34ab32f65897f392bc35e203feda67ae01e4661c761283b3eefc27a1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a054c101c7f12d5d417b289e89af28536fa35a7fb4e3801fe7442cad2e871c2beb886f1be6e9657e775ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0c3e6bfabd4dc08cc03ed5820deb43eee533c8b500cd882c3b3d5fd1e18af47aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073db7bdc16e9640aec17f023655c2a128a9b018b8b4b329febbdb961e0a030aca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02a4d5e38079c89454f77ab7ad12f674da253d493b97a21aeb86a42bc8fd0dd2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a064b6c115ddd52d3cf0a07f3f4fdb8990600d6148bfb1a1d4193d0c03ca0e139e884ff0084dbe2ca8dcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07cd559cae30f9fb09a4a32a1a9e145158a74433930d83bec0d2f08bb82dafbdaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ff11e5187e5e2330ac06e7730534bb4595b3637570fd56405afb7ac8451bab1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcf42935890130f1a0e068d1f949bfd18781cc0e8dad147c525127ba2ec7247ea",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763fffd",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
index a14b2df8f..1038906f8 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcodecallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xc0904c3746dc9a0f093e83a239dd0ebebb697aecd309d2ca2607bfb431608605",
-                    "mixHash" : "0x8fc0ab116e00f9976fc5319f507550dabe7977b9a0abd7e1806a221156080be1",
-                    "nonce" : "0xc30dcf1e713be437",
+                    "hash" : "0xb6754b348b8852fa08eb843e81113e8c4463479a7112b0de3aa42d99dcf763a6",
+                    "mixHash" : "0x9b59bb42f8c36f94061df849f80b3d77db94feb23735dfcef04ddf9de7479501",
+                    "nonce" : "0x167c9772a3c28d67",
                     "number" : "0x01",
                     "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "0x062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
-                    "stateRoot" : "0x5501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabc",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xf41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0fac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a08fc0ab116e00f9976fc5319f507550dabe7977b9a0abd7e1806a221156080be188c30dcf1e713be437f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0faca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a09b59bb42f8c36f94061df849f80b3d77db94feb23735dfcef04ddf9de747950188167c9772a3c28d67f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0904c3746dc9a0f093e83a239dd0ebebb697aecd309d2ca2607bfb431608605",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb6754b348b8852fa08eb843e81113e8c4463479a7112b0de3aa42d99dcf763a6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x2baf40a0ed5cf45814309161962b48bb8f421d40efb574036f8196fbeb99953c",
+                    "mixHash" : "0x84a0c3982b5b556ff46b2256ffa15e70b5447e3f40bdf5a68eea2113a4a48564",
+                    "nonce" : "0x0c38df802c60cfe0",
+                    "number" : "0x01",
+                    "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xf41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0fac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0faca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a084a0c3982b5b556ff46b2256ffa15e70b5447e3f40bdf5a68eea2113a4a48564880c38df802c60cfe0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2baf40a0ed5cf45814309161962b48bb8f421d40efb574036f8196fbeb99953c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xb3cf868f325f6addad6e8b45434bb46733c75178a01cc8d7cf6f0f35ffb2c6cb",
-                    "mixHash" : "0xdb9ddb88958b5c296beb6b7750c3df82c49c25518c7753097a49de1aa024be15",
-                    "nonce" : "0x140131088c0ce97e",
+                    "hash" : "0x2973d8b296697a5531a9657daeff3609bb2ab348e61a59d951fcf75d80388fa7",
+                    "mixHash" : "0x6444a98948b7b5802c919707edf64722155954c609632a5204a154937acf7582",
+                    "nonce" : "0x9e1db4cd776e5c6d",
                     "number" : "0x01",
                     "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
                     "receiptTrie" : "0x062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0db9ddb88958b5c296beb6b7750c3df82c49c25518c7753097a49de1aa024be1588140131088c0ce97ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a06444a98948b7b5802c919707edf64722155954c609632a5204a154937acf7582889e1db4cd776e5c6df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3cf868f325f6addad6e8b45434bb46733c75178a01cc8d7cf6f0f35ffb2c6cb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2973d8b296697a5531a9657daeff3609bb2ab348e61a59d951fcf75d80388fa7",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcodecallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0x1db65602d2c6f6d150e88c33e930c6cec088ef274036e216ab829a4902374808",
-                    "mixHash" : "0xde964c6cb31b5d883f33b3b356b1c1ae0b57cfe1d55a8356530e3a2500e21a4d",
-                    "nonce" : "0xd3e802c9363c4404",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0xa3e14f57f0c5580bceb74e796bb565c34fb7ae3b27787bf9987ee2d85c20f0da",
+                    "mixHash" : "0xad9dfdfb34fe78ca11c2069d36198445f212c38a31dba3f6e41c29961d016d4c",
+                    "nonce" : "0x12727544273f63d5",
                     "number" : "0x01",
                     "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "0x1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
-                    "stateRoot" : "0xe2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795d",
+                    "receiptTrie" : "0x062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3",
+                    "stateRoot" : "0x5501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0de964c6cb31b5d883f33b3b356b1c1ae0b57cfe1d55a8356530e3a2500e21a4d88d3e802c9363c4404f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05501b3d0e4c67bb29c25834b0dbc1437bf3973130f70d0376c2f50142907aabca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0062404de97ac4941fccc862cfe4e75d56e452aa09a40ee40ea82d544f5f537c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ad9dfdfb34fe78ca11c2069d36198445f212c38a31dba3f6e41c29961d016d4c8812727544273f63d5f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1db65602d2c6f6d150e88c33e930c6cec088ef274036e216ab829a4902374808",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa3e14f57f0c5580bceb74e796bb565c34fb7ae3b27787bf9987ee2d85c20f0da",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcodecallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x83efa672bf6141ebdc92aa02629ac2e1648d74a64e731af6f70dcac39de4d3fb",
-                    "mixHash" : "0xd8dc20c96200315ae2de1523a8e3e356dd84f159eec34dec5e449405f90c01db",
-                    "nonce" : "0xcb8be901c05b25df",
+                    "hash" : "0x449c012bc4173a7189f6f1c32769b49f6e34430433d3e42578832b419ea81a34",
+                    "mixHash" : "0x7b41d244059c30764ddee74e4485e4d654f76279243779c2d384fdbfd32ce67d",
+                    "nonce" : "0x47eb6f5451eeb546",
                     "number" : "0x01",
                     "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
                     "receiptTrie" : "0x1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0d8dc20c96200315ae2de1523a8e3e356dd84f159eec34dec5e449405f90c01db88cb8be901c05b25dff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a07b41d244059c30764ddee74e4485e4d654f76279243779c2d384fdbfd32ce67d8847eb6f5451eeb546f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83efa672bf6141ebdc92aa02629ac2e1648d74a64e731af6f70dcac39de4d3fb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x449c012bc4173a7189f6f1c32769b49f6e34430433d3e42578832b419ea81a34",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcodecallcodecall_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcodecallcodecall_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0xbc6be64dceb4f8092c52ebaabb2e11e76ac0224190010fb1c1be4a5d9accfd83",
-                    "mixHash" : "0x096f7f5e07a767eb702a717daa8a4321b70b7fcd924fb0c67a8e041340ba8db7",
-                    "nonce" : "0x703a297d34fa6777",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0x9d7761c9df33af29631b4fa6cc45f79ac9cfa8f90a1ca364db76063eb226fced",
+                    "mixHash" : "0xc3040c54b310705d40e282f93a1cd99a0e1f333677193a9a8d319b65791e69c6",
+                    "nonce" : "0x8b42c7cb9af22f77",
                     "number" : "0x01",
                     "parentHash" : "0xe1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3f",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0xf41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0fac",
+                    "receiptTrie" : "0x1a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016",
+                    "stateRoot" : "0xe2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f41f050b58cb3c1763ffbad422c3b66e18b3818e3efd274126bf6abdc5de0faca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0096f7f5e07a767eb702a717daa8a4321b70b7fcd924fb0c67a8e041340ba8db788703a297d34fa6777f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0e1692e4c3abc70d1d87b5b7364398f062000b59b454b2db4c72fa66dd556dd3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2aae56eb9330d8e33d0dd4543c39b0bfc5c2089cd611541c2bb023fdb3c795da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01a6ad1effdc938e3366aca3fa6af12b04febfaefdae886f63a507b0fc75a0016b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0c3040c54b310705d40e282f93a1cd99a0e1f333677193a9a8d319b65791e69c6888b42c7cb9af22f77f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ed360ad8368bec1e864e44b0a9c314931631069cdcdc5381b5bf853f37dbca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc6be64dceb4f8092c52ebaabb2e11e76ac0224190010fb1c1be4a5d9accfd83",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9d7761c9df33af29631b4fa6cc45f79ac9cfa8f90a1ca364db76063eb226fced",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0.json
index a18f64cd6..4991780d9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_111_OOGE_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_111_OOGE_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/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x75ba508e8d8f737d802ce8ac8b7607fe6811a38526ede74947860385738212a9",
-                    "mixHash" : "0xf17f0dabd8bfa3d5547b88347426c43abf846074b6bf2f462220b049c29699c3",
-                    "nonce" : "0xa6657e96c25bc378",
+                    "hash" : "0xd2341a0b4632828d200dc86a4880136bcd8159f4e1dcef2a5111d445dd352423",
+                    "mixHash" : "0xae1a7f8bf264348a01c93a7a366677e21e01153b821062e65b7db1f2d7a29fa2",
+                    "nonce" : "0x6080c033bf7f53cd",
                     "number" : "0x01",
                     "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "0xbd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
-                    "stateRoot" : "0xe20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xd3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0f17f0dabd8bfa3d5547b88347426c43abf846074b6bf2f462220b049c29699c388a6657e96c25bc378f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0ae1a7f8bf264348a01c93a7a366677e21e01153b821062e65b7db1f2d7a29fa2886080c033bf7f53cdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75ba508e8d8f737d802ce8ac8b7607fe6811a38526ede74947860385738212a9",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd2341a0b4632828d200dc86a4880136bcd8159f4e1dcef2a5111d445dd352423",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -148,10 +155,166 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGE_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_111_OOGE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x9e38f080494d40aa87f2a1b6d0418879e9efe2ab6a88a9f3e0d27b1ae29a30b1",
+                    "mixHash" : "0x231d14281516d90b9f400696fc60182866997799b155cd30f59a3eaccced4719",
+                    "nonce" : "0xc49dc3324234b79d",
+                    "number" : "0x01",
+                    "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
+                    "stateRoot" : "0xd3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0231d14281516d90b9f400696fc60182866997799b155cd30f59a3eaccced471988c49dc3324234b79df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9e38f080494d40aa87f2a1b6d0418879e9efe2ab6a88a9f3e0d27b1ae29a30b1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55892",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a76e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x60016003556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGE_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/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -163,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015892",
-                    "hash" : "0x073b8a42f1767338434b9ba4bb65f14993488b2715042127c92272e5ed465013",
-                    "mixHash" : "0xbc70f188a3bd8c2f1a1d13d3c54cbd0d399f63469be1f4e2edcfdfdc7ae96a95",
-                    "nonce" : "0xaee6985e5fbc07d8",
+                    "hash" : "0x9a2f037b147729dc9c8a791c2909b62e52add858cf82707fb58439f76e047b9f",
+                    "mixHash" : "0x042db630cb98249b395100c6151752649ee6a7a0c8dadc786e2497c15da7f116",
+                    "nonce" : "0xd7703cf29670081a",
                     "number" : "0x01",
                     "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
                     "receiptTrie" : "0xbd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
@@ -174,7 +337,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0bc70f188a3bd8c2f1a1d13d3c54cbd0d399f63469be1f4e2edcfdfdc7ae96a9588aee6985e5fbc07d8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0042db630cb98249b395100c6151752649ee6a7a0c8dadc786e2497c15da7f11688d7703cf29670081af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -211,8 +374,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x073b8a42f1767338434b9ba4bb65f14993488b2715042127c92272e5ed465013",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9a2f037b147729dc9c8a791c2909b62e52add858cf82707fb58439f76e047b9f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -297,10 +460,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGE_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_111_OOGE_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/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -311,19 +474,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d6",
-                    "hash" : "0x481436575a73ff7e8cfcd4d587fd5af30e50386560776f6a15e5be4b553c5272",
-                    "mixHash" : "0x8b5cc3e16af453c3980a8608eecfbf74cb651ffafe599808a5cff8baf31252a2",
-                    "nonce" : "0x13f1da91cb5cecf1",
+                    "gasUsed" : "0x015892",
+                    "hash" : "0x84ba8b99e684230388fac2d4d1397c05ed59b607ea1a7a673251da959b2005ff",
+                    "mixHash" : "0xe437acc67c34d084adcfc3273e742016387cbb95da8479060ba4b5001a2a7c97",
+                    "nonce" : "0x30842b8d4882ccd2",
                     "number" : "0x01",
                     "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "0xf919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
-                    "stateRoot" : "0xaa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01",
+                    "receiptTrie" : "0xbd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82",
+                    "stateRoot" : "0xe20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a08b5cc3e16af453c3980a8608eecfbf74cb651ffafe599808a5cff8baf31252a28813f1da91cb5cecf1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e20af6c2aa8af8a9df4fcb9176e1fc2eaef541e81ed6caed61185c10e0074753a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7c3446d853fa5c762865a0aa49e5c910a568be2c9be5cf8d8d1c70a7028f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0e437acc67c34d084adcfc3273e742016387cbb95da8479060ba4b5001a2a7c978830842b8d4882ccd2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -360,8 +523,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x481436575a73ff7e8cfcd4d587fd5af30e50386560776f6a15e5be4b553c5272",
-        "network" : "Frontier",
+        "lastblockhash" : "0x84ba8b99e684230388fac2d4d1397c05ed59b607ea1a7a673251da959b2005ff",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -394,14 +557,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d6",
+                "balance" : "0x4563918244f55892",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2a",
+                "balance" : "0x0de0b6b3a762a76e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +609,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGE_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_111_OOGE_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/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d6",
-                    "hash" : "0xee12d818b0eacfd952093b63689ad46a4176b39d8d6838152a7a0a928dcd72f0",
-                    "mixHash" : "0xed97cd2786aafe93aac901e5e9382b20feaf9229d72fd3e0d7a5cd28ec3be770",
-                    "nonce" : "0xef8adb4a0b5635a7",
+                    "hash" : "0xd21f0612d2075dfcdac879c35f324cb9bfb615dad01c7109887282a1bc6d6e56",
+                    "mixHash" : "0x2d01fc5b0a2153bdfedb3ca4c154daddb6bd99b72fdc22c24496f01be4aa5081",
+                    "nonce" : "0x8eaeba18512725ba",
                     "number" : "0x01",
                     "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
                     "receiptTrie" : "0xf919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
@@ -472,7 +635,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a0ed97cd2786aafe93aac901e5e9382b20feaf9229d72fd3e0d7a5cd28ec3be77088ef8adb4a0b5635a7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a02d01fc5b0a2153bdfedb3ca4c154daddb6bd99b72fdc22c24496f01be4aa5081888eaeba18512725baf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,8 +672,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee12d818b0eacfd952093b63689ad46a4176b39d8d6838152a7a0a928dcd72f0",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd21f0612d2075dfcdac879c35f324cb9bfb615dad01c7109887282a1bc6d6e56",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -595,10 +758,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGE_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_111_OOGE_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/stCallCodes/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -609,19 +772,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015892",
-                    "hash" : "0xc4ddd1f8dac07b269b661c998d48e1b95ba7df7750a524d12d6faf441d1d8888",
-                    "mixHash" : "0x084bf06df0fcfcdaf776de46c5d06083dee340a31499a331c169fe06d1d246b5",
-                    "nonce" : "0x230d1aa5289d6023",
+                    "gasUsed" : "0x0150d6",
+                    "hash" : "0x9eb116692caee026f051a7a685172a340461e4dc369071433bbfc704825fed34",
+                    "mixHash" : "0x94a79ee95b65604007f331ae04a934130a473e9c01d34435c8fb201f25cb74e0",
+                    "nonce" : "0xcdba75dadae07a31",
                     "number" : "0x01",
                     "parentHash" : "0x356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208",
-                    "receiptTrie" : "0x4771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492a",
-                    "stateRoot" : "0xd3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89",
+                    "receiptTrie" : "0xf919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2",
+                    "stateRoot" : "0xaa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3befae8c66a2035afdc0a44bf274edf7e352929c0498802c9c14fee636c7b89a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04771e3ca3d24834e69c8807935df9053aeb32e06fe40d8a005e1e0abb4ca492ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158928203e880a0084bf06df0fcfcdaf776de46c5d06083dee340a31499a331c169fe06d1d246b588230d1aa5289d6023f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0356400d36d31f4bbbbdddfe7f2b309b4933a9d85349fd5fa7b11108c4dd2e208a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa969a5a5e6e117485a1a2dbc14e84e2387dbf471584e34cc4cb553f66527d01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f919565c7e5ecc29e1cc0f684d11b58e38c31919e892ce6dcf49a4400c9ec9a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d68203e880a094a79ee95b65604007f331ae04a934130a473e9c01d34435c8fb201f25cb74e088cdba75dadae07a31f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -658,16 +821,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad12e52290d253c8536794b476a66d089e16adeb422411f02dc0b9d7adb7ca1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4ddd1f8dac07b269b661c998d48e1b95ba7df7750a524d12d6faf441d1d8888",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9eb116692caee026f051a7a685172a340461e4dc369071433bbfc704825fed34",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -699,14 +855,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55892",
+                "balance" : "0x4563918244f550d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a76e",
+                "balance" : "0x0de0b6b3a762af2a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
index b93becece..4d26b8ab6 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_111_OOGMAfter_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/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x9f14f4647ec3547cc2340a022c97f70b831e8d2f5758a1535b6432d53aa6c1ec",
-                    "mixHash" : "0x7a6b71b9ef5f2a4a46412173500c9e5e6bf4a0577a08f07385cd6c0c21ba52f9",
-                    "nonce" : "0xf37fa28fb2d16d56",
+                    "hash" : "0x64d41a1ce412c6892f4368b0a3acb537703530328d643da13c690a777d3c77e4",
+                    "mixHash" : "0x9e26368637244dc7efac7a3c52c07cbc9d390c958bcf6909dcdeef22f6d08e55",
+                    "nonce" : "0x56d54f30b68cb5fb",
                     "number" : "0x01",
                     "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
-                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xc237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a07a6b71b9ef5f2a4a46412173500c9e5e6bf4a0577a08f07385cd6c0c21ba52f988f37fa28fb2d16d56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a09e26368637244dc7efac7a3c52c07cbc9d390c958bcf6909dcdeef22f6d08e558856d54f30b68cb5fbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f14f4647ec3547cc2340a022c97f70b831e8d2f5758a1535b6432d53aa6c1ec",
-        "network" : "EIP150",
+        "lastblockhash" : "0x64d41a1ce412c6892f4368b0a3acb537703530328d643da13c690a777d3c77e4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_111_OOGMAfter_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/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x982bdf50831ff32f693b3e39b02af162f1e5deb6c08c8919171b3fd0567471d6",
-                    "mixHash" : "0xf00576cb3a4fa335091b1e86424494ac738dac802d0207c646e9378aa148ed81",
-                    "nonce" : "0x5f52857dcdb812ec",
+                    "hash" : "0xfd36c7139f211ba3c9e08b0a4c2d1ab88d632b24d90e9aca00bd163c23838796",
+                    "mixHash" : "0x8b9d4958b32bc5de4996e33470bbc21e8ad3fd2fb377fff715af1468ba11d7a9",
+                    "nonce" : "0x4039aa1b49b17b68",
+                    "number" : "0x01",
+                    "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xc237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a08b9d4958b32bc5de4996e33470bbc21e8ad3fd2fb377fff715af1468ba11d7a9884039aa1b49b17b68f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfd36c7139f211ba3c9e08b0a4c2d1ab88d632b24d90e9aca00bd163c23838796",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x9e9178fe3f03bff9e7154fdbd45652f4b0321af5431f64c36f205304cfe67f4b",
+                    "mixHash" : "0x004d5510b116b3eeb7d261bf7cdeb46bfe4a77e3e2d3ec926a5427173f0a5420",
+                    "nonce" : "0xfbbbe6d514694fda",
                     "number" : "0x01",
                     "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
                     "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0f00576cb3a4fa335091b1e86424494ac738dac802d0207c646e9378aa148ed81885f52857dcdb812ecf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0004d5510b116b3eeb7d261bf7cdeb46bfe4a77e3e2d3ec926a5427173f0a542088fbbbe6d514694fdaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x982bdf50831ff32f693b3e39b02af162f1e5deb6c08c8919171b3fd0567471d6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9e9178fe3f03bff9e7154fdbd45652f4b0321af5431f64c36f205304cfe67f4b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_111_OOGMAfter_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/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xf1367a265338e10afe09d05e79fe73b4dd22fe63a0009bde5b853240c4f03f12",
-                    "mixHash" : "0xc13d5bcfb9d483d5734394885a633c25e5fbe923c2df05930ec2e70440d7f419",
-                    "nonce" : "0x5869bbceea780563",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x1226d2628e190555e967541c38ca9359f9074ca0107ee8e944234603100bedf5",
+                    "mixHash" : "0x157519d017b4049b70d95f1dc757a659bd13e9a5fa6d634046a5fac4b823a399",
+                    "nonce" : "0x6db0ab5fdf8d79c1",
                     "number" : "0x01",
                     "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
-                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
+                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
+                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0c13d5bcfb9d483d5734394885a633c25e5fbe923c2df05930ec2e70440d7f419885869bbceea780563f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a0157519d017b4049b70d95f1dc757a659bd13e9a5fa6d634046a5fac4b823a399886db0ab5fdf8d79c1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,14 +520,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1367a265338e10afe09d05e79fe73b4dd22fe63a0009bde5b853240c4f03f12",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1226d2628e190555e967541c38ca9359f9074ca0107ee8e944234603100bedf5",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -390,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555fd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa03",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -442,10 +605,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_111_OOGMAfter_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/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x4d580d02ae5b62f3780713b56230491fa7b796108f27998b0f3bf917a63326e6",
-                    "mixHash" : "0x793bb4c45b7c30df7da813ef0b08842ba3e6696c02316bd60cd53effeca4cb2a",
-                    "nonce" : "0xeb58c225d3b6e619",
+                    "hash" : "0x5f9e13ef7b152d9c18f331e5e0b645b09683949d08bf122cfd192164367625f1",
+                    "mixHash" : "0x475c623a5413ff67df093d77cb023f34117d8e5641a30c650393af3b156e8654",
+                    "nonce" : "0x5523ef742d23f02b",
                     "number" : "0x01",
                     "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
                     "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
@@ -468,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0793bb4c45b7c30df7da813ef0b08842ba3e6696c02316bd60cd53effeca4cb2a88eb58c225d3b6e619f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a0475c623a5413ff67df093d77cb023f34117d8e5641a30c650393af3b156e8654885523ef742d23f02bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -505,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d580d02ae5b62f3780713b56230491fa7b796108f27998b0f3bf917a63326e6",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5f9e13ef7b152d9c18f331e5e0b645b09683949d08bf122cfd192164367625f1",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -589,10 +752,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_111_OOGMAfter_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/stCallCodes/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -603,19 +766,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xdd9e13c9cc0bdd1e3400087918d93772f4a867981bb0a9e07bfb7ce34023d7fd",
-                    "mixHash" : "0x0d18eecf8f9f8362fa972d1e65c34499062eed8101f6c674e28580b45415f469",
-                    "nonce" : "0xb2414e2c7842fb11",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xba76390184a4d8a470aacdf223a67ef686dc56e7c2e5d12fcab93eb2261af897",
+                    "mixHash" : "0x13619a8eec56afe9d6379191a9d5730ee25f17eb982952d125b038046773fc6f",
+                    "nonce" : "0xd9eda8feb7aebf43",
                     "number" : "0x01",
                     "parentHash" : "0xb1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258",
-                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
-                    "stateRoot" : "0xc237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931",
+                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
+                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fd8203e880a00d18eecf8f9f8362fa972d1e65c34499062eed8101f6c674e28580b45415f46988b2414e2c7842fb11f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0b1e2417a7b0cb0244010a8cd77095c3d9504605460efa720ef7caa3fab35a258a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a013619a8eec56afe9d6379191a9d5730ee25f17eb982952d125b038046773fc6f88d9eda8feb7aebf43f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,22 +815,14 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd9e13c9cc0bdd1e3400087918d93772f4a867981bb0a9e07bfb7ce34023d7fd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xba76390184a4d8a470aacdf223a67ef686dc56e7c2e5d12fcab93eb2261af897",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -692,14 +847,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555fd",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa03",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
index 051b4bc19..1ea885db8 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_111_OOGMBefore_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/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x58d5cfc727d5cd12ba2b2c93c4d8ac63f7d870c309d63c8fb738adcbdd42f61e",
-                    "mixHash" : "0x664a731f83b2a61eff8caf22a54fe86e38023f3c1f624fd9783fb9667b66575d",
-                    "nonce" : "0x1a4f831e1bab9e95",
+                    "hash" : "0xdeb07ed12894e04848e9bd081caff1da4e01d60c69faa63f7c1e7bda6b33f922",
+                    "mixHash" : "0x542658ba6fabe7df46774125c56109a7cdcf6cfccea01ab61d40419d136cefc4",
+                    "nonce" : "0x48457c6ca912bb50",
                     "number" : "0x01",
                     "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "0x72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
-                    "stateRoot" : "0xc85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xfec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0664a731f83b2a61eff8caf22a54fe86e38023f3c1f624fd9783fb9667b66575d881a4f831e1bab9e95f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0542658ba6fabe7df46774125c56109a7cdcf6cfccea01ab61d40419d136cefc48848457c6ca912bb50f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58d5cfc727d5cd12ba2b2c93c4d8ac63f7d870c309d63c8fb738adcbdd42f61e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdeb07ed12894e04848e9bd081caff1da4e01d60c69faa63f7c1e7bda6b33f922",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -147,10 +154,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_111_OOGMBefore_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/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -162,9 +169,164 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f4",
-                    "hash" : "0x634ae0cf08aab0cc2e30244beb38feadd0d3c40eff8a6c7c9870d08904b4efca",
-                    "mixHash" : "0xd3fa117ad90452390c6088df26dd3d1d83329eada40a61ef049f39898ba1befd",
-                    "nonce" : "0xec516d43fe49d477",
+                    "hash" : "0x4ecbb85921a75a9f88e11101140006f3269b568e375bb736898eab1a13a06ee7",
+                    "mixHash" : "0x73cf3a289eebe050f3dc555bffb23e7363cafc470ca3be99e01a1abdb259f8ce",
+                    "nonce" : "0x3782f4a9751cd30b",
+                    "number" : "0x01",
+                    "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
+                    "stateRoot" : "0xfec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a073cf3a289eebe050f3dc555bffb23e7363cafc470ca3be99e01a1abdb259f8ce883782f4a9751cd30bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4ecbb85921a75a9f88e11101140006f3269b568e375bb736898eab1a13a06ee7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xd33565984dde6045a4a84e1eeb250554f4b98dafcf83f814b2e822155d9ad186",
+                    "mixHash" : "0xa3852010fc05f693a0c1a1e678031d7591fd60a390bcd273a66a913943e4dca8",
+                    "nonce" : "0xb31d6edffde27bee",
                     "number" : "0x01",
                     "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
                     "receiptTrie" : "0x72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
@@ -173,7 +335,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0d3fa117ad90452390c6088df26dd3d1d83329eada40a61ef049f39898ba1befd88ec516d43fe49d477f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0a3852010fc05f693a0c1a1e678031d7591fd60a390bcd273a66a913943e4dca888b31d6edffde27beef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -210,8 +372,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x634ae0cf08aab0cc2e30244beb38feadd0d3c40eff8a6c7c9870d08904b4efca",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd33565984dde6045a4a84e1eeb250554f4b98dafcf83f814b2e822155d9ad186",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -295,10 +457,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_111_OOGMBefore_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/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -309,19 +471,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xdbef4a5e320b5ac88d120315a7f7d0360a74368698be415fee4ccb9b323b675f",
-                    "mixHash" : "0x89871c1cfb6fbbe887b60050dc697b57b62cccf7a5a4c7f7f9fce3368f29da29",
-                    "nonce" : "0x4b337cb7a1d4d150",
+                    "gasUsed" : "0x0155f4",
+                    "hash" : "0xbc69a3db1717e02044a8199d2c2c5eabc3c955fcdd349cb3c15489692216f080",
+                    "mixHash" : "0x2bc20f4f3b63356a40aa13ea45574c0a7e080b7f582124dc1948b176587120c7",
+                    "nonce" : "0x214bc9df1bd258a5",
                     "number" : "0x01",
                     "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "0x571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
-                    "stateRoot" : "0x44dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6",
+                    "receiptTrie" : "0x72239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6",
+                    "stateRoot" : "0xc85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a089871c1cfb6fbbe887b60050dc697b57b62cccf7a5a4c7f7f9fce3368f29da29884b337cb7a1d4d150f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c89719ce819512ce409d429bba07d4ab7bd2c5862bb26cabb9e7837c022e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea072239dc860420b7e923c2b971c45222ceee9324aeadf35a0aada8c59f0cb79d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a02bc20f4f3b63356a40aa13ea45574c0a7e080b7f582124dc1948b176587120c788214bc9df1bd258a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -358,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbef4a5e320b5ac88d120315a7f7d0360a74368698be415fee4ccb9b323b675f",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbc69a3db1717e02044a8199d2c2c5eabc3c955fcdd349cb3c15489692216f080",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -391,14 +553,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
+                "balance" : "0x4563918244f555f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
+                "balance" : "0x0de0b6b3a762aa0c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +605,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_111_OOGMBefore_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/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x26a907e80c36f72bd74aafaa41a38c81ce48f1981b3ee40858bc8c60447665aa",
-                    "mixHash" : "0x0b4f6fffcc877b74da5fde57f6de4a4dcb59e1be215658e764598c7049387fe8",
-                    "nonce" : "0xd8550c39b263d388",
+                    "hash" : "0xa0e7a57829758d05642fbb34fa3b2a8de551c94d6d8988a4a4cf3027aa4388f4",
+                    "mixHash" : "0x22e77eecb2d4033d2b5072a72cb128c395fd64d7b823341c218f81868156c4dc",
+                    "nonce" : "0xe173cfb114d5574f",
                     "number" : "0x01",
                     "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
                     "receiptTrie" : "0x571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
@@ -469,7 +631,7 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a00b4f6fffcc877b74da5fde57f6de4a4dcb59e1be215658e764598c7049387fe888d8550c39b263d388f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a022e77eecb2d4033d2b5072a72cb128c395fd64d7b823341c218f81868156c4dc88e173cfb114d5574ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,8 +668,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26a907e80c36f72bd74aafaa41a38c81ce48f1981b3ee40858bc8c60447665aa",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa0e7a57829758d05642fbb34fa3b2a8de551c94d6d8988a4a4cf3027aa4388f4",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -591,10 +753,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMBefore_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_111_OOGMBefore_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/stCallCodes/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -605,19 +767,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f4",
-                    "hash" : "0x80c377aad09da11dfe14a5422beff6e0ef68d0fd6730ced8217b246155da878f",
-                    "mixHash" : "0xef54402be8601ac382fc905a6957854a667443d3e629d9a981010422419b4eba",
-                    "nonce" : "0xfd138bf30ef12294",
+                    "gasUsed" : "0x0150cc",
+                    "hash" : "0xefcaa74bfdb57eec2c7bc7aa47a6621ff8cb2ead848b5dc8ee60c529e7651536",
+                    "mixHash" : "0x3106be50bcb3bab215be63426b2264b472be2c97949d19f9fd2156229de2ae35",
+                    "nonce" : "0x165b352cf930c023",
                     "number" : "0x01",
                     "parentHash" : "0x94823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6b",
-                    "receiptTrie" : "0x23538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2d",
-                    "stateRoot" : "0xfec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7",
+                    "receiptTrie" : "0x571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986",
+                    "stateRoot" : "0x44dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fec7cc3eeaa99659377fbbcbefde3b7edc11892257f9d90cf641e4be188e28e7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea023538bb0f2690c0e1bce4b7a561db3d1b68361566f5c97e04cd3f7137a5d1c2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f48203e880a0ef54402be8601ac382fc905a6957854a667443d3e629d9a981010422419b4eba88fd138bf30ef12294f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a094823d432255ba148c2306763542f60af924568db1bfe1d857a46aca53483d6ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044dda085e724a1930ee72141687fe0cc434a5f73abcee10806f849788c0e34d6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0571f25fc91261846c7ae8c20f28840d019c004e8ac0ccb49ba84b27442baf986b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cc8203e880a03106be50bcb3bab215be63426b2264b472be2c97949d19f9fd2156229de2ae3588165b352cf930c023f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -654,16 +816,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df688ab368def569e028da42c4b092425859d3774bcb7ac4c7d8572dceeefebea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80c377aad09da11dfe14a5422beff6e0ef68d0fd6730ced8217b246155da878f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xefcaa74bfdb57eec2c7bc7aa47a6621ff8cb2ead848b5dc8ee60c529e7651536",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
@@ -694,14 +849,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f4",
+                "balance" : "0x4563918244f550cc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0c",
+                "balance" : "0x0de0b6b3a762af34",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
index 0a3f4c313..b7faa6e4b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_111_SuicideEnd_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/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xbff0f39168d580c56e7dc53a2c7f32030137d18cc8c0ad5571982f7b45aaafe3",
-                    "mixHash" : "0x8a16073dce3ef70807cb04069752562178e6a4edd13d7279aa0964a74ae91166",
-                    "nonce" : "0x50823a3638f21582",
+                    "hash" : "0x931e90fc8c31365d9f750946c503aceb5ba2c8dd8f6de96e9d776211f310b991",
+                    "mixHash" : "0x0a76f0de7c5cb7bbd7fb4ed7a88c9d848ae85b12352839ee15521c542f23972a",
+                    "nonce" : "0xbfe23f2a37572861",
                     "number" : "0x01",
                     "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "0x4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
-                    "stateRoot" : "0xa5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xc54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a08a16073dce3ef70807cb04069752562178e6a4edd13d7279aa0964a74ae911668850823a3638f21582f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a00a76f0de7c5cb7bbd7fb4ed7a88c9d848ae85b12352839ee15521c542f23972a88bfe23f2a37572861f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbff0f39168d580c56e7dc53a2c7f32030137d18cc8c0ad5571982f7b45aaafe3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x931e90fc8c31365d9f750946c503aceb5ba2c8dd8f6de96e9d776211f310b991",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -139,10 +146,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_111_SuicideEnd_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/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -154,9 +161,156 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e7",
-                    "hash" : "0xd0541cf143e7a186269da84031cd9d8e9d0a9f980effb187bcb0e23a080d937e",
-                    "mixHash" : "0x25aec3c22d5176022d3ff161205cb0f8fb25ba512196fdcce71ffbff1fdbdae9",
-                    "nonce" : "0xc1f12fe02e2a7e06",
+                    "hash" : "0xa2c9222cc4daea02e3dd837b7affcec9fb4ee54b9b957bcfbff54185ae5c8b4f",
+                    "mixHash" : "0x18ada5242f6af07d92ccb97725364973568eec36e502c5530ef1a543aeea8d3a",
+                    "nonce" : "0x80186faa77c1a72f",
+                    "number" : "0x01",
+                    "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
+                    "stateRoot" : "0xc54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a018ada5242f6af07d92ccb97725364973568eec36e502c5530ef1a543aeea8d3a8880186faa77c1a72ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa2c9222cc4daea02e3dd837b7affcec9fb4ee54b9b957bcfbff54185ae5c8b4f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f548e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b719",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0xf90ee888e2ef4d92671188bc33aacc93b18e7f18186e197bbfa3412bf6c5965f",
+                    "mixHash" : "0x87303e842510a9207b6d749ee03c186b0780e3374eb7e1abaee3fc0c3a9030ee",
+                    "nonce" : "0x8f09a4f78e7a2af6",
                     "number" : "0x01",
                     "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
                     "receiptTrie" : "0x4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
@@ -165,7 +319,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a025aec3c22d5176022d3ff161205cb0f8fb25ba512196fdcce71ffbff1fdbdae988c1f12fe02e2a7e06f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a087303e842510a9207b6d749ee03c186b0780e3374eb7e1abaee3fc0c3a9030ee888f09a4f78e7a2af6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -202,8 +356,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0541cf143e7a186269da84031cd9d8e9d0a9f980effb187bcb0e23a080d937e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf90ee888e2ef4d92671188bc33aacc93b18e7f18186e197bbfa3412bf6c5965f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -279,10 +433,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_111_SuicideEnd_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/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -293,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da3",
-                    "hash" : "0xf8e2732cee93da700dd12cea10e08b5702890867750e63a26cc0e099b2cc54d5",
-                    "mixHash" : "0xd961eb60e053af3c510a4b7d1660a21ff6b08042e48e2fc6dc13be6d86748f78",
-                    "nonce" : "0x26c1b2ade17524c7",
+                    "gasUsed" : "0x0148e7",
+                    "hash" : "0x9229a71fac9e64338d4fec3469978ec8714b4df804e8fa48b496e686aa5715ca",
+                    "mixHash" : "0x56daf6f2a9111e238a45e5c93015b88c24e6e209eadebe3513fbf8ae4347f3fa",
+                    "nonce" : "0x1558c95340373e3e",
                     "number" : "0x01",
                     "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "0x27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
-                    "stateRoot" : "0xa77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77",
+                    "receiptTrie" : "0x4bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4",
+                    "stateRoot" : "0xa5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0d961eb60e053af3c510a4b7d1660a21ff6b08042e48e2fc6dc13be6d86748f788826c1b2ade17524c7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5cceb488948c261ee22bf210b8fb358e3323d64247d7ea2335e2c30900c5867a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04bd84c174204ca46701dc19bb709be4621e48fd2a9d039b137d4571622879df4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a056daf6f2a9111e238a45e5c93015b88c24e6e209eadebe3513fbf8ae4347f3fa881558c95340373e3ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -342,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8e2732cee93da700dd12cea10e08b5702890867750e63a26cc0e099b2cc54d5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9229a71fac9e64338d4fec3469978ec8714b4df804e8fa48b496e686aa5715ca",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -367,14 +521,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da3",
+                "balance" : "0x4563918244f548e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d25d",
+                "balance" : "0x0de0b6b3a762b719",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +573,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_111_SuicideEnd_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/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,9 +588,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x012da3",
-                    "hash" : "0xdb9fab3e2e8ee3f7351ef512b497e3cd531b5f70462563a7d06f35e9454f5495",
-                    "mixHash" : "0x163c6185e43bd1b303aa38ccd8fdd2db14ebc6bb0d0f0cf82a73b85c69dd675d",
-                    "nonce" : "0xe5e58d242da6fe13",
+                    "hash" : "0x9119d74c0185e93599f84c9ef19c0eb78dce37be3ce9dbb5cf973e7f284517d5",
+                    "mixHash" : "0x5373186097a52ebe0f9fe6519580acc52f149709c5594745e032d06598d40e82",
+                    "nonce" : "0x5a7fc966debcf3f1",
                     "number" : "0x01",
                     "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
                     "receiptTrie" : "0x27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
@@ -445,7 +599,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a0163c6185e43bd1b303aa38ccd8fdd2db14ebc6bb0d0f0cf82a73b85c69dd675d88e5e58d242da6fe13f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a05373186097a52ebe0f9fe6519580acc52f149709c5594745e032d06598d40e82885a7fc966debcf3f1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,8 +636,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb9fab3e2e8ee3f7351ef512b497e3cd531b5f70462563a7d06f35e9454f5495",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9119d74c0185e93599f84c9ef19c0eb78dce37be3ce9dbb5cf973e7f284517d5",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -559,10 +713,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_111_SuicideEnd_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/stCallCodes/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -573,19 +727,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e7",
-                    "hash" : "0x3eec0d47edf812096f7a74831a4ecd2d85ec8345e5c7fcd1aa26a7961a43edb4",
-                    "mixHash" : "0x6d2372955d658ea8fab44181016ccf2dd8c037206ebcf29eca62b9dbe0f07259",
-                    "nonce" : "0xd2c22fcfe9fe6f49",
+                    "gasUsed" : "0x012da3",
+                    "hash" : "0x962c5ebf4ca621a2afeaf940c0a6cfe93b9976472895e954b4e1c68efdd9a899",
+                    "mixHash" : "0x2c3dec6d2dcb41438bb40a08c654a4d567b0f6d5a6134db2a2154e56aa27947f",
+                    "nonce" : "0xde84a438a230e0a2",
                     "number" : "0x01",
                     "parentHash" : "0x8400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9d",
-                    "receiptTrie" : "0xc203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44",
-                    "stateRoot" : "0xc54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967",
+                    "receiptTrie" : "0x27152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32",
+                    "stateRoot" : "0xa77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c54286436eff51410535ce3004b0fbf65ee6c16b9e46e290c8c3c12f866bc967a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c203d8358afd0b35886f7da8ccab4b95c25145e50adda084d6ae4e44b867bf44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e78203e880a06d2372955d658ea8fab44181016ccf2dd8c037206ebcf29eca62b9dbe0f0725988d2c22fcfe9fe6f49f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08400a958557cf3d0593739de3b27d147b91e44f425a1ab464c8eba7c4a4eef9da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a77f6de28ac35c9f1e0c5da8845d404456ee2cd812380b93abd5a4c59abbde77a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a027152705d1b7cf668e98f87a6312dab87d385d36e6e15a44c29ca4a28b50db32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da38203e880a02c3dec6d2dcb41438bb40a08c654a4d567b0f6d5a6134db2a2154e56aa27947f88de84a438a230e0a2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -622,16 +776,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3adedf1b5b14b6bc2d5dcb76cbf151cfe0e5f2b55539e48746b8c61979aa21fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3eec0d47edf812096f7a74831a4ecd2d85ec8345e5c7fcd1aa26a7961a43edb4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x962c5ebf4ca621a2afeaf940c0a6cfe93b9976472895e954b4e1c68efdd9a899",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -654,14 +801,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e7",
+                "balance" : "0x4563918244f52da3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b719",
+                "balance" : "0x0de0b6b3a762d25d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
index aaf23caa2..0517b8a60 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x8d5c72a4ac2f5d969ede7dd94117ffbc58ca56f83e5b3be401f86bbce6571d0a",
-                    "mixHash" : "0x869dcc71b794f500b86908c0dd78d2cdd7dc61d84b64ee6e12179401c394bfa8",
-                    "nonce" : "0x3291be8ef87ba572",
+                    "hash" : "0xd790e6f23ba715f11e9dab06ca0499e8c1aa7a55fe61309ddcb94cdbc8ff1c60",
+                    "mixHash" : "0x0913298e463118dd405c7869db9ad03047f7637f0cb877031d58e8b7c8807126",
+                    "nonce" : "0xe6b239e45d32a279",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
-                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0869dcc71b794f500b86908c0dd78d2cdd7dc61d84b64ee6e12179401c394bfa8883291be8ef87ba572f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a00913298e463118dd405c7869db9ad03047f7637f0cb877031d58e8b7c880712688e6b239e45d32a279f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d5c72a4ac2f5d969ede7dd94117ffbc58ca56f83e5b3be401f86bbce6571d0a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd790e6f23ba715f11e9dab06ca0499e8c1aa7a55fe61309ddcb94cdbc8ff1c60",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -139,10 +146,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -154,9 +161,156 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x51113193e851cff739217703df37a26fb50369aa12b6d9cac03ebeb3dad5f513",
-                    "mixHash" : "0x5f337aa1cd0ff6828605d433a8fb92749a9419bb763e18bfa337f00200acfc5d",
-                    "nonce" : "0xd099417762994f97",
+                    "hash" : "0xe9448aa2a5ad715b0da2f5e148f219f1115e2bc4fc18582a0db15f0cdfdf689c",
+                    "mixHash" : "0x658444861ee68ae91657bc55e783c933220396411adc04e6d47952ab73a95299",
+                    "nonce" : "0x566bbefe0d3b7f2a",
+                    "number" : "0x01",
+                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0658444861ee68ae91657bc55e783c933220396411adc04e6d47952ab73a9529988566bbefe0d3b7f2af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe9448aa2a5ad715b0da2f5e148f219f1115e2bc4fc18582a0db15f0cdfdf689c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x95cc0930ba04b3e64a732a5ebc463c3e42165b71fb031edc1c6da52bd21ccef1",
+                    "mixHash" : "0x9a7982fcdf44c8a3a8c2527a1cf651519820ac66b7a194aea4ee18aef8811a9e",
+                    "nonce" : "0xf02ae37f122fe434",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
                     "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
@@ -165,7 +319,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a05f337aa1cd0ff6828605d433a8fb92749a9419bb763e18bfa337f00200acfc5d88d099417762994f97f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a09a7982fcdf44c8a3a8c2527a1cf651519820ac66b7a194aea4ee18aef8811a9e88f02ae37f122fe434f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -202,8 +356,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51113193e851cff739217703df37a26fb50369aa12b6d9cac03ebeb3dad5f513",
-        "network" : "EIP158",
+        "lastblockhash" : "0x95cc0930ba04b3e64a732a5ebc463c3e42165b71fb031edc1c6da52bd21ccef1",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -279,10 +433,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -293,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xea4b681d591b5574e4285d44aa705138b1be70a033fafb586f6b776d41fe49a3",
-                    "mixHash" : "0x8315d240d4fd2bdfb0cee67543584ac661e297346006f9dd7a6e6ea6d3574c1e",
-                    "nonce" : "0x002bd0fc2151d8ff",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xd4290c3a6389acdefa51a475afa454ab3ea5c0b126487507762b64bb6b60a6e6",
+                    "mixHash" : "0xe91e9cc7313e959e17886625076cc318c4df702b65ffff468885962376849dd1",
+                    "nonce" : "0xb5b8f73dcbc263aa",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
-                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
+                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a08315d240d4fd2bdfb0cee67543584ac661e297346006f9dd7a6e6ea6d3574c1e88002bd0fc2151d8fff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0e91e9cc7313e959e17886625076cc318c4df702b65ffff468885962376849dd188b5b8f73dcbc263aaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -342,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea4b681d591b5574e4285d44aa705138b1be70a033fafb586f6b776d41fe49a3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd4290c3a6389acdefa51a475afa454ab3ea5c0b126487507762b64bb6b60a6e6",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -367,14 +521,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -419,10 +573,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,9 +588,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x88d2fd9ce40dea68346671a9bed534b771ffc1e44490004114837a3dbe3b3218",
-                    "mixHash" : "0xe963a0cb5fde072e1b9aaac68c8ac53798c4600a42c0107053c778d561327b10",
-                    "nonce" : "0x3c20ef900974c81e",
+                    "hash" : "0x8f88099b048ebeb8f9ef8768180b4f49abd1a776be879952e0917df0ee2ab295",
+                    "mixHash" : "0x4b60339ff4a583c3236a3640cf0bbdd14742ad67f523a372560b7cba032ccdf7",
+                    "nonce" : "0xa17cf80a2ea7bb4b",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
                     "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
@@ -445,7 +599,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0e963a0cb5fde072e1b9aaac68c8ac53798c4600a42c0107053c778d561327b10883c20ef900974c81ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a04b60339ff4a583c3236a3640cf0bbdd14742ad67f523a372560b7cba032ccdf788a17cf80a2ea7bb4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,8 +636,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88d2fd9ce40dea68346671a9bed534b771ffc1e44490004114837a3dbe3b3218",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8f88099b048ebeb8f9ef8768180b4f49abd1a776be879952e0917df0ee2ab295",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -559,10 +713,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -573,19 +727,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x7b69181b480d7cc978f33bcc19603cac929aa0193f05b5b9ea22c092ddf27ca9",
-                    "mixHash" : "0xf26e87f6d2cd2647fd4d0efd93ce1168d218e1befaca27fc41aba723ee061b16",
-                    "nonce" : "0x87d96b0e1f2062cb",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x94429014bdfea634bb990eb64e835836b83b16dbd47b7aa441afa14ef9deff6a",
+                    "mixHash" : "0xd1226404c1ff8022a403697b3077aea4b89d6744f4ec630aaecdf6ac63ebc8f5",
+                    "nonce" : "0x18d28a74d691125c",
                     "number" : "0x01",
                     "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
+                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f26e87f6d2cd2647fd4d0efd93ce1168d218e1befaca27fc41aba723ee061b168887d96b0e1f2062cbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0d1226404c1ff8022a403697b3077aea4b89d6744f4ec630aaecdf6ac63ebc8f58818d28a74d691125cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -622,16 +776,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b69181b480d7cc978f33bcc19603cac929aa0193f05b5b9ea22c092ddf27ca9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x94429014bdfea634bb990eb64e835836b83b16dbd47b7aa441afa14ef9deff6a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -654,14 +801,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_d0g0v0.json
index 0a8c4c23e..bfd8742b3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_111_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_111_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/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x9fcf528eec9cb6aaacf780bea6683708e81a730637f3b913fa4060c8ac1899d2",
-                    "mixHash" : "0xc9c9c67b1bb5ded943cae4b9c4a8c56fb136c1f1df9e5812ffb60e8498904032",
-                    "nonce" : "0xf3f0f0260f197caa",
+                    "hash" : "0xc93a11c6d3bfffe91a6e5a31755a6998f947adef8680d25c1b4fc4dafa23bdbd",
+                    "mixHash" : "0xabb06b9146d26ba22f9e5c60ba94a5994ebbfdef01942f7d0a03f2de02890ef8",
+                    "nonce" : "0x595c9737a145d445",
                     "number" : "0x01",
                     "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "0xf3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
-                    "stateRoot" : "0xe0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x94e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0c9c9c67b1bb5ded943cae4b9c4a8c56fb136c1f1df9e5812ffb60e849890403288f3f0f0260f197caaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0abb06b9146d26ba22f9e5c60ba94a5994ebbfdef01942f7d0a03f2de02890ef888595c9737a145d445f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fcf528eec9cb6aaacf780bea6683708e81a730637f3b913fa4060c8ac1899d2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc93a11c6d3bfffe91a6e5a31755a6998f947adef8680d25c1b4fc4dafa23bdbd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -157,10 +164,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_111_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/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -172,9 +179,174 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0404a3",
-                    "hash" : "0x6b02f9f50d5e1144c0672992d62bb781cf7de94c62ed8f8c42171f1e6376e6d0",
-                    "mixHash" : "0xbf1600301ce84685c35eb57cee0689b6e9fcab0de7f1955e33ce9e4726241a19",
-                    "nonce" : "0xdc157da5cf2c1323",
+                    "hash" : "0x6ae20df7dad644facdd0b6a35d2654690b4ee746031c520c379d7a5246f7ecc7",
+                    "mixHash" : "0xe31ebe2dae507833c2026eafa1d77da2656f6c665415a9b058fb26b063515cfe",
+                    "nonce" : "0xa9f10966c4d8f084",
+                    "number" : "0x01",
+                    "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
+                    "stateRoot" : "0x94e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0e31ebe2dae507833c2026eafa1d77da2656f6c665415a9b058fb26b063515cfe88a9f10966c4d8f084f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x63c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6ae20df7dad644facdd0b6a35d2654690b4ee746031c520c379d7a5246f7ecc7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x014a" : "0x1000000000000000000000000000000000000000",
+                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x0150" : "0x40",
+                    "0x0152" : "0x26",
+                    "0x0154" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x1000000000000000000000000000000000000000",
+                    "0x07" : "0x03"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f804a3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75ffb5d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0x01338c04fc7656955995eb1777c682068207f1d6e6718866e99372f3e02daa04",
+                    "mixHash" : "0xfab29cadc949ff581e3453a6b1236755baea802a7eab8ad5b50eb2856e381557",
+                    "nonce" : "0x946096684dd79c15",
                     "number" : "0x01",
                     "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
                     "receiptTrie" : "0xf3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
@@ -183,7 +355,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0bf1600301ce84685c35eb57cee0689b6e9fcab0de7f1955e33ce9e4726241a1988dc157da5cf2c1323f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a0fab29cadc949ff581e3453a6b1236755baea802a7eab8ad5b50eb2856e38155788946096684dd79c15f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -220,8 +392,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b02f9f50d5e1144c0672992d62bb781cf7de94c62ed8f8c42171f1e6376e6d0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x01338c04fc7656955995eb1777c682068207f1d6e6718866e99372f3e02daa04",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -315,10 +487,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_111_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/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,19 +501,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03fce7",
-                    "hash" : "0x3f77ae4c84cfdf0a81ec487789a3973ea8e00e592da73d9a65022fbb493d1125",
-                    "mixHash" : "0x9c16b5a23ba4ba2e7da14da858453f87b817a1a7b4e4cd66bf16b10725c26ec2",
-                    "nonce" : "0xd809a2dcb5580728",
+                    "gasUsed" : "0x0404a3",
+                    "hash" : "0xdee9ae3789d233316da5273cdc401fb0cb18793e3bf2b9132cd71fed707943a1",
+                    "mixHash" : "0x2abcb7774c5868aef6aa9ef1c2bb96d24ea2f6793406a9ceb71b1ec285fbba00",
+                    "nonce" : "0x661f856a331bb0d8",
                     "number" : "0x01",
                     "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "0x40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
-                    "stateRoot" : "0xa492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4",
+                    "receiptTrie" : "0xf3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352",
+                    "stateRoot" : "0xe0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a09c16b5a23ba4ba2e7da14da858453f87b817a1a7b4e4cd66bf16b10725c26ec288d809a2dcb5580728f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0bbe7bee0a1dfd3c46a3066aae3b76525ab8a93e71627281d1989f1e89d1150a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f3ec3f5da2a1e8e0b58252deb945accf7dd7c50cd34ff74a927f15f322ea8352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a02abcb7774c5868aef6aa9ef1c2bb96d24ea2f6793406a9ceb71b1ec285fbba0088661f856a331bb0d8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -378,8 +550,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f77ae4c84cfdf0a81ec487789a3973ea8e00e592da73d9a65022fbb493d1125",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdee9ae3789d233316da5273cdc401fb0cb18793e3bf2b9132cd71fed707943a1",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -421,14 +593,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7fce7",
+                "balance" : "0x4563918244f804a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7600319",
+                "balance" : "0x0de0b6b3a75ffb5d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +645,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_111_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/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03fce7",
-                    "hash" : "0x5d7d543783e6e817ef10ac3fe26785148d3476fb59819b1530f677af601713bd",
-                    "mixHash" : "0xcd2f3711f07872fff49b732300d06d58be942a7b41d7f619860efb66469b395d",
-                    "nonce" : "0x443f66008f727567",
+                    "hash" : "0x1079da8f2d15a6a56ecd9bc85dc77792550f6da2c5a314e11bdd9639c1773a5e",
+                    "mixHash" : "0xf1d97f760bd4c63e5fe00439e5c3f3dc028228964e57487ea7a373ed3f60abf5",
+                    "nonce" : "0x8ea716d5079e9017",
                     "number" : "0x01",
                     "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
                     "receiptTrie" : "0x40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
@@ -499,7 +671,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0cd2f3711f07872fff49b732300d06d58be942a7b41d7f619860efb66469b395d88443f66008f727567f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0f1d97f760bd4c63e5fe00439e5c3f3dc028228964e57487ea7a373ed3f60abf5888ea716d5079e9017f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -536,8 +708,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d7d543783e6e817ef10ac3fe26785148d3476fb59819b1530f677af601713bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1079da8f2d15a6a56ecd9bc85dc77792550f6da2c5a314e11bdd9639c1773a5e",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -631,10 +803,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_111_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/stCallCodes/callcodecallcodecallcode_111_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +817,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0404a3",
-                    "hash" : "0xe17694569c48cd1b9e79f9c4cdab35992eb4b1b8a7d48d62529a5b5af15a769f",
-                    "mixHash" : "0x8d4b073f0686bb4be46a836b0bd58cde7b277123cb887e10beae6ae67acaea25",
-                    "nonce" : "0xc1d101e0b7c4b335",
+                    "gasUsed" : "0x03fce7",
+                    "hash" : "0xa0510a015692099b95b99465a57c91b1df0a8873d9e64d153df400095218f918",
+                    "mixHash" : "0x089580b825418dc159ae63b5ab251db1a718d94ae569577bbaa836bdf5fabe3c",
+                    "nonce" : "0x18fd8079eaeb73df",
                     "number" : "0x01",
                     "parentHash" : "0x81fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39b",
-                    "receiptTrie" : "0x602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28",
-                    "stateRoot" : "0x94e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253",
+                    "receiptTrie" : "0x40117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58eda",
+                    "stateRoot" : "0xa492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094e55876c4a910a86980f45821c23a22763b1052417eda9a5e041c86abdec253a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0602f4f17e431e94b53a726b0000a38c4d35f15655d562e1857a50a459b90ff28b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830404a38203e880a08d4b073f0686bb4be46a836b0bd58cde7b277123cb887e10beae6ae67acaea2588c1d101e0b7c4b335f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a081fbe22f75eaa09ab2206f14dc495ef033be30d653443a91bf3716832679c39ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a492fac14f892ae18d8e7e41b7a804b324d58a53d92fa972be11b09b6374c0c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040117d8bcc0572f6af98ace01395dc51429170100ac1928a11866c0371f58edab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303fce78203e880a0089580b825418dc159ae63b5ab251db1a718d94ae569577bbaa836bdf5fabe3c8818fd8079eaeb73dff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,16 +866,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063c6978d3ab1a4f17965a6227d267e071753f752913e22b4a113e9af1bf64a15a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe17694569c48cd1b9e79f9c4cdab35992eb4b1b8a7d48d62529a5b5af15a769f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa0510a015692099b95b99465a57c91b1df0a8873d9e64d153df400095218f918",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
@@ -744,14 +909,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f804a3",
+                "balance" : "0x4563918244f7fce7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75ffb5d",
+                "balance" : "0x0de0b6b3a7600319",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
index e5556ac10..fb1a9cf72 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP150" : {
+    "callcodecallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xc89fa3d4b1f9495a7f7adcc74984ee3a47f2382a5cdff3f83c1ea3f0f5e9d881",
-                    "mixHash" : "0x92a52b2f96a09ae4ab7875db98363c268335023c1ceba2bf93eacfb1cdc69ab9",
-                    "nonce" : "0xa43c9f7458fa2e80",
+                    "hash" : "0x046b53440a905b2b8487a6bceb88a8c07459d6c00a74a58f5ab58eed1a887f58",
+                    "mixHash" : "0x3b8529484b9a3474560b18ead6f4fa87aafbff7e0ea68713e20a29909ca5cbce",
+                    "nonce" : "0x112366c6af381a7d",
                     "number" : "0x01",
                     "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "0x8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
-                    "stateRoot" : "0x83c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954e",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xa4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441fec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a092a52b2f96a09ae4ab7875db98363c268335023c1ceba2bf93eacfb1cdc69ab988a43c9f7458fa2e80f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441feca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a03b8529484b9a3474560b18ead6f4fa87aafbff7e0ea68713e20a29909ca5cbce88112366c6af381a7df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc89fa3d4b1f9495a7f7adcc74984ee3a47f2382a5cdff3f83c1ea3f0f5e9d881",
-        "network" : "EIP150",
+        "lastblockhash" : "0x046b53440a905b2b8487a6bceb88a8c07459d6c00a74a58f5ab58eed1a887f58",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -134,10 +141,152 @@
             }
         }
     },
-    "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_EIP158" : {
+    "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x3cd8df4e67cdffb6b8f28adc6f6a5ef0bbdd5c93ae6da086a8cb204cf6d26ae1",
+                    "mixHash" : "0x59fbd46cd39b64eb176d89b1342a67dfe7fba75f497e08ac22b01bb29c707449",
+                    "nonce" : "0x7026caf196fa06ce",
+                    "number" : "0x01",
+                    "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
+                    "stateRoot" : "0xa4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441fec",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441feca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a059fbd46cd39b64eb176d89b1342a67dfe7fba75f497e08ac22b01bb29c707449887026caf196fa06cef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x01c9c380",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
+                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x84dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3cd8df4e67cdffb6b8f28adc6f6a5ef0bbdd5c93ae6da086a8cb204cf6d26ae1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fcab7e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75b5482",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -149,9 +298,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7e",
-                    "hash" : "0xd07d4d76ca54cb741e5e60f5ec118e6d8b663c224ea4eae8f5a9d6bedc4ba88a",
-                    "mixHash" : "0xeb2d019b92db5690f98e100756130db945fd988b255894ce89a2d4a08873e986",
-                    "nonce" : "0xab2515d91033a872",
+                    "hash" : "0x8cc29eeb8d2e1eed1fb4582381870d5255ad5e72e3e5855eb2de739e42ad3944",
+                    "mixHash" : "0xec3d6b125373385b2dfc89939bc7e83ed4a5ce5a84c45250ba31e82327e3b2f2",
+                    "nonce" : "0xada250a59e7db30e",
                     "number" : "0x01",
                     "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
                     "receiptTrie" : "0x8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
@@ -160,7 +309,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0eb2d019b92db5690f98e100756130db945fd988b255894ce89a2d4a08873e98688ab2515d91033a872f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ec3d6b125373385b2dfc89939bc7e83ed4a5ce5a84c45250ba31e82327e3b2f288ada250a59e7db30ef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,8 +346,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd07d4d76ca54cb741e5e60f5ec118e6d8b663c224ea4eae8f5a9d6bedc4ba88a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8cc29eeb8d2e1eed1fb4582381870d5255ad5e72e3e5855eb2de739e42ad3944",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -269,10 +418,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_Frontier" : {
+    "callcodecallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -283,19 +432,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08a3c2",
-                    "hash" : "0x5369d55950d0744ffd06511761290ecdbbfb31fa37492323984154a94b330959",
-                    "mixHash" : "0xb5bd5ad7d706720cf8e91cdbf281786efb3d81390bdfc1340111c50640f53e72",
-                    "nonce" : "0xac9102b6d266f896",
+                    "gasUsed" : "0x08ab7e",
+                    "hash" : "0x8e0b94c56330c3ac2c24324fe38a8111a00d55ae50c6895fd4b826e7cff7e81e",
+                    "mixHash" : "0x58dbeff152febd5de017e9a6fb06ac3437d0c3af9b0f5e46d3ae9329c34fea5d",
+                    "nonce" : "0x064df2af26c8a834",
                     "number" : "0x01",
                     "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "0x7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
-                    "stateRoot" : "0x2abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9de",
+                    "receiptTrie" : "0x8aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596",
+                    "stateRoot" : "0x83c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0b5bd5ad7d706720cf8e91cdbf281786efb3d81390bdfc1340111c50640f53e7288ac9102b6d266f896f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083c7648973abe1384750f404c82016b837ab2dec5211caf99b7551f58a4e954ea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08aa47b435083b079c7d820ab44bb5e85c7f53d63e65bcce0e670276fe01e2596b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a058dbeff152febd5de017e9a6fb06ac3437d0c3af9b0f5e46d3ae9329c34fea5d88064df2af26c8a834f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -332,8 +481,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5369d55950d0744ffd06511761290ecdbbfb31fa37492323984154a94b330959",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8e0b94c56330c3ac2c24324fe38a8111a00d55ae50c6895fd4b826e7cff7e81e",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -359,14 +508,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fca3c2",
+                "balance" : "0x4563918244fcab7e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5c3e",
+                "balance" : "0x0de0b6b3a75b5482",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -404,10 +553,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_Homestead" : {
+    "callcodecallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -419,9 +568,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3c2",
-                    "hash" : "0x9bd0059c2f8ed04306e82414f95e1fe71aec688a5f556ea74290e477840a522e",
-                    "mixHash" : "0xbe940aa8914a1d16ca7c7121d732e95d0e66270c88cca61573f2df3c6fd434e2",
-                    "nonce" : "0x3001b601589d3df8",
+                    "hash" : "0xf3eeaa6e39948cf5c67d34556179313a7f1d3c21c2d66c18deaf7979edfe8040",
+                    "mixHash" : "0x1b53898b67b3a838652946c7afc2410739308b163ddf1c4bdf2a72453a2b71fc",
+                    "nonce" : "0xd593eca741620bec",
                     "number" : "0x01",
                     "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
                     "receiptTrie" : "0x7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
@@ -430,7 +579,7 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0be940aa8914a1d16ca7c7121d732e95d0e66270c88cca61573f2df3c6fd434e2883001b601589d3df8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a01b53898b67b3a838652946c7afc2410739308b163ddf1c4bdf2a72453a2b71fc88d593eca741620becf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -467,8 +616,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bd0059c2f8ed04306e82414f95e1fe71aec688a5f556ea74290e477840a522e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf3eeaa6e39948cf5c67d34556179313a7f1d3c21c2d66c18deaf7979edfe8040",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -539,10 +688,10 @@
             }
         }
     },
-    "callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0_Metropolis" : {
+    "callcodecallcodecallcode_ABCB_RECURSIVE_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/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -553,19 +702,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7e",
-                    "hash" : "0xca1ae68245e9b040c860eee71393d8ea62afc4f53dbcaec6bd7f2e7acf236fb5",
-                    "mixHash" : "0xab3ed4e3ff81e45aa434183d8db2a68dd284874273497bbaf4e0da5ed7a458e2",
-                    "nonce" : "0xece71d6f2d5237d8",
+                    "gasUsed" : "0x08a3c2",
+                    "hash" : "0x96d74d731855077647c2c55147298b947e9c21b0f1a77329703dd9a5b1bb1eef",
+                    "mixHash" : "0xe70af4ffb4757c2d4107498d18012d8b3e251d3381a30753440a6816bf5b3658",
+                    "nonce" : "0x652d7f4b7c2ddfc9",
                     "number" : "0x01",
                     "parentHash" : "0xdd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210",
-                    "receiptTrie" : "0x25b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3",
-                    "stateRoot" : "0xa4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441fec",
+                    "receiptTrie" : "0x7d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52",
+                    "stateRoot" : "0x2abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9de",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e7cddad827504b0962d34e3a45edaddc847ec923575b71c74b1c4a66441feca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a025b8109fab8d65ec3e3f4465aa49f45762f6b0055ea16eb94538fa390cfadca3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7e8203e880a0ab3ed4e3ff81e45aa434183d8db2a68dd284874273497bbaf4e0da5ed7a458e288ece71d6f2d5237d8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0dd32897f0537b345458e9dc4ce7403d9cc9dadf4b29be5fd163d57e8a85a8210a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02abf7a7afb41ad0678b45b2227c0ba8cc40c6cf830b1bdb7737a9cda7a87a9dea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a07d84ce8e249b1fa4e7d607700f13cb47c3c01226919ddc011619f9ead53a2e52b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3c28203e880a0e70af4ffb4757c2d4107498d18012d8b3e251d3381a30753440a6816bf5b365888652d7f4b7c2ddfc9f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -602,16 +751,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084dbef3fc203218b5d28cbe1758e36787e2c50e7ec61ce48751ca60e39b4d346a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca1ae68245e9b040c860eee71393d8ea62afc4f53dbcaec6bd7f2e7acf236fb5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x96d74d731855077647c2c55147298b947e9c21b0f1a77329703dd9a5b1bb1eef",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
@@ -636,14 +778,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7e",
+                "balance" : "0x4563918244fca3c2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5482",
+                "balance" : "0x0de0b6b3a75b5c3e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {